Liang Qi dbef41f43e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: examples/qtestlib/tutorial5/containers.cpp examples/widgets/tools/tools.pro src/corelib/io/qprocess.cpp src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/network/kernel/qdnslookup_unix.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/testlib/qtestcase.cpp tools/configure/configureapp.cpp Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8		2016-05-06 15:36:44 +02: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-05-06 15:36:44 +02:00
qsocks5socketengine	Updated license headers	2016-01-21 18:55:18 +00:00
qtcpserver	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-27 09:18:05 +02:00
qtcpsocket	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00
qudpsocket	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00
socket.pro	WinRT: Fixed compilation of network autotests and benchmarks	2013-12-06 15:06:47 +01:00