Simon Hausmann e281537f20 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/qglobal.h src/platformsupport/platformcompositor/qopenglcompositor.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I5422868500be695584a496dbbbc719d146bc572d		2014-12-18 12:12:58 +01:00
..
qabstractnetworkcache	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qftp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qhttpnetworkconnection	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qhttpnetworkreply	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qnetworkaccessmanager	Merge remote-tracking branch 'origin/5.3' into 5.4	2014-09-29 13:38:11 +02:00
qnetworkcachemetadata	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qnetworkcookie	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qnetworkcookiejar	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qnetworkdiskcache	QNetworkDiskCache: Fix QNetworkDiskCache don't handle to set CookieHeader.	2014-10-22 09:20:10 +02:00
qnetworkreply	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-18 12:12:58 +01:00
qnetworkrequest	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
spdy	Removing a few unneeded "? true : false"	2014-10-09 09:43:26 +02:00
access.pro	network: add support for the SPDY protocol	2014-02-19 21:44:15 +01:00