Liang Qi 790aef362f Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: .qmake.conf configure src/corelib/global/qglobal.h src/tools/qdoc/node.cpp src/tools/qdoc/qdocdatabase.cpp tests/auto/corelib/io/qsettings/tst_qsettings.cpp tools/configure/configureapp.cpp Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f		2015-10-23 14:45:03 +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	Set the Qt API level to compatibility mode in all tests.	2012-08-01 15:37:46 +02:00
qsettings.qrc	Properly detect UTF-8 BOM markers in ini files	2014-10-29 08:58:31 +01:00
resourcefile.ini	…
resourcefile2.ini	…
resourcefile3.ini	…
resourcefile4.ini	…
resourcefile5.ini	…
tst_qsettings.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-23 14:45:03 +02:00