qt5base-lts/tests/auto/network/access
Allan Sandfeld Jensen 1fce111809 Merge remote-tracking branch 'origin/5.4' into merge5.5
Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/io/qnoncontiguousbytedevice_p.h
	src/gui/image/qjpeghandler.cpp
	src/network/access/qhttpthreaddelegate_p.h
	tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
	tests/auto/widgets/widgets/qmenubar/BLACKLIST

Change-Id: I01de8c1c28efcedfd7953d05025f54802dc08ab3
2015-05-08 13:26:44 +02:00
..
qabstractnetworkcache Update copyright headers 2015-02-11 06:49:51 +00:00
qftp Update copyright headers 2015-02-11 06:49:51 +00:00
qhttpnetworkconnection Update copyright headers 2015-02-11 06:49:51 +00:00
qhttpnetworkreply Update copyright headers 2015-02-11 06:49:51 +00:00
qnetworkaccessmanager Update copyright headers 2015-02-11 06:49:51 +00:00
qnetworkcachemetadata Update copyright headers 2015-02-11 06:49:51 +00:00
qnetworkcookie Update copyright headers 2015-02-11 06:49:51 +00:00
qnetworkcookiejar QUrl effective TLDs: update table 2015-02-13 07:28:17 +00:00
qnetworkdiskcache Merge remote-tracking branch 'origin/5.4' into 5.5 2015-03-04 13:44:29 +01:00
qnetworkreply Merge remote-tracking branch 'origin/5.4' into merge5.5 2015-05-08 13:26:44 +02:00
qnetworkrequest Update copyright headers 2015-02-11 06:49:51 +00:00
spdy Update copyright headers 2015-02-11 06:49:51 +00:00
access.pro network: add support for the SPDY protocol 2014-02-19 21:44:15 +01:00