1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Read the .ini file back in text mode

Browse Source 
Because on Windows, the .ini files are saved with CRLF, but the files in
the Qt resource are just LF (.gitattributes makes them so).

Task-number: QTBUG-25446
Change-Id: I5eab0d9620bd1ba675b0a87c554f62cef0f98fcc
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Thiago Macieira 2017-01-17 10:40:01 -08:00
parent c20fa2879e
commit e2c0d1ea2e
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
View File

@ -2315,14 +2315,14 @@ void tst_QSettings::setIniCodec()
{
QFile inFile(settings4.fileName());
inFile.open(QIODevice::ReadOnly);
inFile.open(QIODevice::ReadOnly | QIODevice::Text);
actualContents4 = inFile.readAll();
inFile.close();
}
{
QFile inFile(settings5.fileName());
inFile.open(QIODevice::ReadOnly);
inFile.open(QIODevice::ReadOnly | QIODevice::Text);
actualContents5 = inFile.readAll();
inFile.close();
}
@ -2330,9 +2330,6 @@ void tst_QSettings::setIniCodec()
QConfFile::clearCache();
#ifdef Q_OS_WIN
QEXPECT_FAIL("", "QTBUG-25446", Abort);
#endif
QCOMPARE(actualContents4, expeContents4);
QCOMPARE(actualContents5, expeContents5);