qt5base-lts/tests/auto/network/access
Simon Hausmann e2f66f9215 Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
	src/corelib/global/qnamespace.qdoc
	src/corelib/io/qwindowspipereader.cpp
	src/corelib/io/qwindowspipereader_p.h
	src/corelib/statemachine/qstatemachine.cpp
	src/corelib/statemachine/qstatemachine_p.h
	src/plugins/platforms/xcb/qxcbconnection.h
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/tools/qmake/tst_qmake.cpp
	tests/manual/touch/main.cpp

Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
2015-06-03 10:23:56 +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.5' into dev 2015-06-03 10:23:56 +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