qt5base-lts/tests/auto/corelib/io/qsettings
Liang Qi beb65dcd79 Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	src/gui/painting/painting.pri
	src/plugins/platforms/xcb/qxcbconnection.cpp
	tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
	tests/auto/corelib/tools/qlocale/test/test.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
	tools/configure/environment.cpp

Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495
2015-12-18 08:37:31 +01:00
..
.gitattributes Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
.gitignore Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
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 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
resourcefile2.ini Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
resourcefile3.ini Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
resourcefile4.ini Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
resourcefile5.ini Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
resourcefile.ini Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
tst_qsettings.cpp Remove remaining support for Blackberry 2015-11-21 15:38:39 +00:00