Liang Qi dd756011da Merge remote-tracking branch 'origin/5.8' into 5.9 ... Conflicts: configure.json mkspecs/win32-icc/qmake.conf Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f		2017-02-08 15:49:18 +01:00
..
.gitattributes
.gitignore
BLACKLIST	Extend blacklisting of tst_qsettings to OSX 10.11	2015-12-15 09:45:51 +00:00
bom.ini	Properly detect UTF-8 BOM markers in ini files	2014-10-29 08:58:31 +01:00
qsettings.pro	Don't truncate QDateTime milliseconds when storing QSettings on Apple platforms	2016-10-05 18:45:04 +00:00
qsettings.qrc	Fix data corruption when reading byte arrays from QSettings	2017-02-03 15:37:58 +00:00
resourcefile2.ini
resourcefile3.ini
resourcefile4.ini
resourcefile5.ini
resourcefile6.plist	Fix data corruption when reading byte arrays from QSettings	2017-02-03 15:37:58 +00:00
resourcefile.ini
tst_qsettings.cpp	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-02-08 15:49:18 +01:00