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
..
qauthenticator	tests/auto/network: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).	2015-07-31 04:29:33 +00:00
qdnslookup	tests/auto/network: Remove some placeholder formatting.	2015-10-19 12:38:28 +00:00
qdnslookup_appless	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qhostaddress	Tests: Remove empty init/cleanup slots, constructors and destructors.	2015-12-10 05:26:05 +00:00
qhostinfo	Tests: Remove empty init/cleanup slots, constructors and destructors.	2015-12-10 05:26:05 +00:00
qnetworkaddressentry	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qnetworkinterface	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
qnetworkproxy	Update copyright headers	2015-02-11 06:49:51 +00:00
qnetworkproxyfactory	Remove remaining support for Blackberry	2015-11-21 15:38:39 +00:00
kernel.pro	Disable tst_qhostinfo on OS X.	2014-10-10 13:15:43 +02:00