Liang Qi 17198e03ab Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/global/qglobal.cpp src/corelib/tools/qstring.cpp src/network/socket/qabstractsocket.cpp src/network/socket/qnativesocketengine_unix.cpp src/plugins/platforms/eglfs/api/qeglfsglobal.h Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288		2016-08-16 07:58:32 +02:00
..
platformsocketengine	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-16 07:58:32 +02:00
qabstractsocket	Updated license headers	2016-01-21 18:55:18 +00:00
qhttpsocketengine	QtNetwork: Remove Windows CE.	2016-03-29 20:28:18 +00:00
qlocalsocket	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-09 17:59:51 +02:00
qsctpsocket	Fix some syntax issues in SCTP implementation	2016-08-03 06:21:47 +00:00
qsocks5socketengine	QtNetwork: Remove Windows CE.	2016-03-29 20:28:18 +00:00
qtcpserver	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-12 08:33:08 +02:00
qtcpsocket	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-01 18:20:00 +02:00
qudpsocket	Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev	2016-06-21 14:07:10 +00:00
socket.pro	Introduce SCTP sockets support	2016-07-27 06:37:24 +00:00