Frederik Gladhorn 77da617dc8 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: doc/global/qt-cpp-defines.qdocconf src/3rdparty/forkfd/forkfd.c src/corelib/codecs/qtextcodec.cpp src/corelib/kernel/qmetatype.cpp src/corelib/tools/qset.qdoc src/gui/accessible/qaccessible.cpp src/gui/image/qpixmapcache.cpp src/opengl/qgl.cpp src/tools/qdoc/generator.cpp src/widgets/kernel/qwidget.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085		2015-08-06 10:54:01 +02:00
..
alive	Update copyright headers	2015-02-11 06:49:51 +00:00
assert	Update copyright headers	2015-02-11 06:49:51 +00:00
badxml	Update copyright headers	2015-02-11 06:49:51 +00:00
benchlibcallgrind	Update copyright headers	2015-02-11 06:49:51 +00:00
benchlibcounting	Update copyright headers	2015-02-11 06:49:51 +00:00
benchlibeventcounter	Update copyright headers	2015-02-11 06:49:51 +00:00
benchliboptions	Update copyright headers	2015-02-11 06:49:51 +00:00
benchlibtickcounter	Update copyright headers	2015-02-11 06:49:51 +00:00
benchlibwalltime	Update copyright headers	2015-02-11 06:49:51 +00:00
blacklisted	TestCase: Also check main source path when looking for test data	2015-05-05 07:06:52 +00:00
cmptest	QTestLib: Add macros QTRY_VERIFY2_WITH_TIMEOUT(), QTRY_VERIFY2().	2015-07-22 19:32:39 +00:00
commandlinedata	Update copyright headers	2015-02-11 06:49:51 +00:00
counting	Update copyright headers	2015-02-11 06:49:51 +00:00
crashes	Update copyright headers	2015-02-11 06:49:51 +00:00
datatable	Update copyright headers	2015-02-11 06:49:51 +00:00
datetime	Update copyright headers	2015-02-11 06:49:51 +00:00
differentexec	Update copyright headers	2015-02-11 06:49:51 +00:00
exceptionthrow	Update copyright headers	2015-02-11 06:49:51 +00:00
expectfail	Update copyright headers	2015-02-11 06:49:51 +00:00
failcleanup	Update copyright headers	2015-02-11 06:49:51 +00:00
failinit	Update copyright headers	2015-02-11 06:49:51 +00:00
failinitdata	Update copyright headers	2015-02-11 06:49:51 +00:00
fetchbogus	Update copyright headers	2015-02-11 06:49:51 +00:00
findtestdata	Update copyright headers	2015-02-11 06:49:51 +00:00
float	Update copyright headers	2015-02-11 06:49:51 +00:00
globaldata	Update copyright headers	2015-02-11 06:49:51 +00:00
longstring	Update copyright headers	2015-02-11 06:49:51 +00:00
maxwarnings	Update copyright headers	2015-02-11 06:49:51 +00:00
multiexec	Update copyright headers	2015-02-11 06:49:51 +00:00
printdatatags	Update copyright headers	2015-02-11 06:49:51 +00:00
printdatatagswithglobaltags	Update copyright headers	2015-02-11 06:49:51 +00:00
qexecstringlist	Update copyright headers	2015-02-11 06:49:51 +00:00
silent	Update copyright headers	2015-02-11 06:49:51 +00:00
singleskip	Update copyright headers	2015-02-11 06:49:51 +00:00
skip	Update copyright headers	2015-02-11 06:49:51 +00:00
skipcleanup	Update copyright headers	2015-02-11 06:49:51 +00:00
skipinit	Update copyright headers	2015-02-11 06:49:51 +00:00
skipinitdata	Update copyright headers	2015-02-11 06:49:51 +00:00
sleep	Update copyright headers	2015-02-11 06:49:51 +00:00
strcmp	Update copyright headers	2015-02-11 06:49:51 +00:00
subtest	Update copyright headers	2015-02-11 06:49:51 +00:00
test	QtTest tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:20 +01:00
verbose1	QtTest tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:20 +01:00
verbose2	QtTest tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:20 +01:00
verifyexceptionthrown	Update copyright headers	2015-02-11 06:49:51 +00:00
warnings	Update copyright headers	2015-02-11 06:49:51 +00:00
xunit	Update copyright headers	2015-02-11 06:49:51 +00:00
.gitignore	Revert "Remove unused overload of QTest::qExec."	2011-12-12 10:43:44 +01:00
expected_alive.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_assert.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_assert.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_assert.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_assert.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_badxml.lightxml	Change how QDebug escapes QStrings in the output	2015-08-06 04:53:38 +00:00
expected_badxml.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_badxml.xml	Change how QDebug escapes QStrings in the output	2015-08-06 04:53:38 +00:00
expected_badxml.xunitxml	Change how QDebug escapes QStrings in the output	2015-08-06 04:53:38 +00:00
expected_benchlibcallgrind.csv	Add a CSV logging feature to the benchlib	2014-02-14 00:34:25 +01:00
expected_benchlibcallgrind.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_benchlibcounting.csv	Add a CSV logging feature to the benchlib	2014-02-14 00:34:25 +01:00
expected_benchlibcounting.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_benchlibcounting.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_benchlibcounting.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_benchlibcounting.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_benchlibeventcounter.csv	Add a CSV logging feature to the benchlib	2014-02-14 00:34:25 +01:00
expected_benchlibeventcounter.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_benchlibeventcounter.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_benchlibeventcounter.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_benchlibeventcounter.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_benchliboptions.csv	Add a CSV logging feature to the benchlib	2014-02-14 00:34:25 +01:00
expected_benchliboptions.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_benchlibtickcounter.csv	Add a CSV logging feature to the benchlib	2014-02-14 00:34:25 +01:00
expected_benchlibtickcounter.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_benchlibtickcounter.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_benchlibtickcounter.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_benchlibtickcounter.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_benchlibwalltime.csv	Add a CSV logging feature to the benchlib	2014-02-14 00:34:25 +01:00
expected_benchlibwalltime.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_benchlibwalltime.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_benchlibwalltime.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_benchlibwalltime.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_blacklisted.txt	TestCase: Also check main source path when looking for test data	2015-05-05 07:06:52 +00:00
expected_cmptest.lightxml	QTestLib: Add macros QTRY_VERIFY2_WITH_TIMEOUT(), QTRY_VERIFY2().	2015-07-22 19:32:39 +00:00
expected_cmptest.txt	QTestLib: Add macros QTRY_VERIFY2_WITH_TIMEOUT(), QTRY_VERIFY2().	2015-07-22 19:32:39 +00:00
expected_cmptest.xml	QTestLib: Add macros QTRY_VERIFY2_WITH_TIMEOUT(), QTRY_VERIFY2().	2015-07-22 19:32:39 +00:00
expected_cmptest.xunitxml	QTestLib: Add macros QTRY_VERIFY2_WITH_TIMEOUT(), QTRY_VERIFY2().	2015-07-22 19:32:39 +00:00
expected_commandlinedata.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_commandlinedata.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_commandlinedata.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_commandlinedata.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_counting.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_counting.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_counting.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_counting.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_crashes_1.txt	QtTest: Output correct library name	2013-05-27 00:41:46 +02:00
expected_crashes_2.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_crashes_3.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_datatable.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_datatable.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_datatable.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_datatable.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_datetime.lightxml	Autotest: Selftests fail in UTC timezone	2015-01-19 10:21:26 +01:00
expected_datetime.txt	Autotest: Selftests fail in UTC timezone	2015-01-19 10:21:26 +01:00
expected_datetime.xml	Autotest: Selftests fail in UTC timezone	2015-01-19 10:21:26 +01:00
expected_datetime.xunitxml	Autotest: Selftests fail in UTC timezone	2015-01-19 10:21:26 +01:00
expected_differentexec.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_exceptionthrow.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_exceptionthrow.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_exceptionthrow.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_exceptionthrow.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_expectfail.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_expectfail.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_expectfail.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_expectfail.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_failcleanup.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_failcleanup.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_failcleanup.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_failcleanup.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_failinit.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_failinit.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_failinit.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_failinit.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_failinitdata.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_failinitdata.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_failinitdata.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_failinitdata.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_fetchbogus.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_fetchbogus.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_fetchbogus.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_fetchbogus.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_findtestdata.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_findtestdata.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_findtestdata.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_findtestdata.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_float.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_globaldata.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_globaldata.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_globaldata.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_globaldata.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_longstring.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_longstring.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_longstring.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_longstring.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_maxwarnings.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_maxwarnings.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_maxwarnings.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_maxwarnings.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_multiexec.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_printdatatags.txt	Fixing naming of selftests.	2011-12-05 09:02:15 +01:00
expected_printdatatagswithglobaltags.txt	Fixing naming of selftests.	2011-12-05 09:02:15 +01:00
expected_qexecstringlist.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_silent.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_singleskip.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_singleskip.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_singleskip.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_singleskip.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_skip.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_skip.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_skip.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_skip.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_skipcleanup.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_skipcleanup.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_skipcleanup.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_skipcleanup.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_skipinit.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_skipinit.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_skipinit.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_skipinit.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_skipinitdata.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_skipinitdata.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_skipinitdata.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_skipinitdata.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_sleep.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_strcmp.lightxml	Make the printing of complex byte arrays prettier	2015-02-15 06:35:43 +00:00
expected_strcmp.txt	Make the printing of complex byte arrays prettier	2015-02-15 06:35:43 +00:00
expected_strcmp.xml	Make the printing of complex byte arrays prettier	2015-02-15 06:35:43 +00:00
expected_strcmp.xunitxml	Make the printing of complex byte arrays prettier	2015-02-15 06:35:43 +00:00
expected_subtest.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_subtest.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_subtest.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_subtest.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_verbose1.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_verbose1.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_verbose1.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_verbose1.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_verbose2.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_verbose2.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_verbose2.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_verbose2.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_verifyexceptionthrown.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_verifyexceptionthrown.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_verifyexceptionthrown.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_verifyexceptionthrown.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_warnings.lightxml	Add QtInfoMsg	2015-01-09 13:14:05 +01:00
expected_warnings.txt	Add QtInfoMsg	2015-01-09 13:14:05 +01:00
expected_warnings.xml	Add QtInfoMsg	2015-01-09 13:14:05 +01:00
expected_warnings.xunitxml	Add QtInfoMsg	2015-01-09 13:14:05 +01:00
expected_xunit.lightxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_xunit.txt	Add support for blacklisting test functions	2014-09-21 20:58:41 +02:00
expected_xunit.xml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
expected_xunit.xunitxml	Use new QLibraryInfo::build() in testlib to log build information.	2014-02-27 13:20:19 +01:00
generate_expected_output.py	Update copyright headers	2015-02-11 06:49:51 +00:00
selftests.pri	TestCase: Also check main source path when looking for test data	2015-05-05 07:06:52 +00:00
selftests.pro	Changed selftests unittest to work from installation directory.	2012-01-11 04:09:26 +01:00
selftests.qrc	TestCase: Also check main source path when looking for test data	2015-05-05 07:06:52 +00:00
tst_selftests.cpp	Fix sub test float of tests/auto/testlib/selftests/tst_selftests for MSVC 2015.	2015-07-17 14:15:19 +00:00