Liang Qi b7ac036b72 Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: src/network/socket/qabstractsocket.cpp src/plugins/platforms/winrt/qwinrtscreen.cpp src/sql/drivers/mysql/qsql_mysql.cpp Change-Id: Ifb73623d09f53340ee5e10283f1f86b580998902		2015-10-13 23:03:51 +02:00
..
access	Don't let closed http sockets pass as valid connections	2015-10-13 16:40:56 +00:00
bearer	tests/auto/network: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).	2015-07-31 04:29:33 +00:00
kernel	Autotest: Make tst_QNetworkInterface::interfaceFromXXX data-driven	2015-09-13 18:54:10 +00:00
socket	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-10-13 23:03:51 +02:00
ssl	Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev	2015-08-09 07:06:52 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00