Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c		2015-07-01 11:05:26 +02:00
..
platformsocketengine	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
qabstractsocket	Move the socket test to an appropriate file	2015-02-23 16:33:54 +00:00
qhttpsocketengine	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
qlocalsocket	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
qsocks5socketengine	Blacklist socks bind test on Windows	2015-06-20 15:25:39 +00:00
qtcpserver	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
qtcpsocket	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
qudpsocket	Skip instead of entirely excluding tests with disabled features	2015-03-16 09:34:15 +00:00
socket.pro	WinRT: Fixed compilation of network autotests and benchmarks	2013-12-06 15:06:47 +01:00