Liang Qi 6cb8121a44 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/widgets/styles/qgtkstyle_p.cpp tests/auto/corelib/io/qtextstream/test/test.pro tests/auto/corelib/plugin/plugin.pro Change-Id: I512bc1b36acf3933ed2b96c00f476ee3819c1f4b		2016-03-21 09:02:57 +01:00
..
platformsocketengine	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
qabstractsocket	Updated license headers	2016-01-21 18:55:18 +00:00
qhttpsocketengine	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
qlocalsocket	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-21 09:02:57 +01:00
qsocks5socketengine	Updated license headers	2016-01-21 18:55:18 +00:00
qtcpserver	Updated license headers	2016-01-21 18:55:18 +00:00
qtcpsocket	QAbstractSocket: do not fail writing on read buffer overflow	2016-03-18 13:05:42 +00:00
qudpsocket	Updated license headers	2016-01-21 18:55:18 +00:00
socket.pro	WinRT: Fixed compilation of network autotests and benchmarks	2013-12-06 15:06:47 +01:00