Liang Qi 4456984da7 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/tools/qversionnumber/qversionnumber.pro Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e		2015-10-14 15:45:35 +02:00
..
.gitattributes
.gitignore
BLACKLIST	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
bom.ini	Properly detect UTF-8 BOM markers in ini files	2014-10-29 08:58:31 +01:00
qsettings.pro
qsettings.qrc	Properly detect UTF-8 BOM markers in ini files	2014-10-29 08:58:31 +01:00
resourcefile2.ini
resourcefile3.ini
resourcefile4.ini
resourcefile5.ini
resourcefile.ini
tst_qsettings.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-14 15:45:35 +02:00