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
..
qabstractnetworkcache	tests/auto/network: Remove some placeholder formatting.	2015-10-19 12:38:28 +00:00
qftp	Tests: Remove empty init/cleanup slots, constructors and destructors.	2015-12-10 05:26:05 +00:00
qhttpnetworkconnection	Tests: Remove empty init/cleanup slots, constructors and destructors.	2015-12-10 05:26:05 +00:00
qhttpnetworkreply	Tests: Remove empty init/cleanup slots, constructors and destructors.	2015-12-10 05:26:05 +00:00
qnetworkaccessmanager	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-14 15:45:35 +02:00
qnetworkcachemetadata	Tests: Remove empty init/cleanup slots, constructors and destructors.	2015-12-10 05:26:05 +00:00
qnetworkcookie	tests/auto/network: Remove some placeholder formatting.	2015-10-19 12:38:28 +00:00
qnetworkcookiejar	tst_qnetworkcookiejar: Added TESTDATA to .pro file	2015-11-20 14:41:22 +00:00
qnetworkdiskcache	Tests: Remove empty init/cleanup slots, constructors and destructors.	2015-12-10 05:26:05 +00:00
qnetworkreply	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
qnetworkrequest	tests/auto/network: Remove some placeholder formatting.	2015-10-19 12:38:28 +00:00
spdy	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
access.pro	network: add support for the SPDY protocol	2014-02-19 21:44:15 +01:00