qt5base-lts/tests/auto/network/bearer
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
..
qnetworkconfiguration tests/auto/network: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). 2015-07-31 04:29:33 +00:00
qnetworkconfigurationmanager tests/auto/network: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). 2015-07-31 04:29:33 +00:00
qnetworkconfigurationmanagerqappless Update copyright headers 2015-02-11 06:49:51 +00:00
qnetworksession Merge remote-tracking branch 'origin/5.6' into dev 2015-12-18 08:37:31 +01:00
bearer.pro Fix crash in QNetworkAccessManager. 2014-05-19 15:52:58 +02:00
qbearertestcommon.h Update copyright headers 2015-02-11 06:49:51 +00:00