qt5base-lts/tests/auto/corelib/global
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
..
q_func_info Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qflags Merge remote-tracking branch 'origin/5.6' into dev 2015-12-02 23:33:06 +01:00
qgetputenv Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qglobal Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qglobalstatic Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qhooks Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qlogging Merge remote-tracking branch 'origin/5.6' into dev 2015-12-18 08:37:31 +01:00
qnumeric Add {add,sub,mul}_overflow for signed integers. 2015-11-20 11:08:05 +00:00
qrand Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qtendian Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
global.pro Add a more reliable replacement for qt_add/removeObject(). 2014-04-15 17:50:20 +02:00