Liang Qi deee7b7ece Merge remote-tracking branch 'origin/5.13' into dev ... Conflicts: .qmake.conf qmake/generators/makefile.cpp Change-Id: Ifb2633a69d0bf8cdf12d799c6259beefc279c49e		2019-07-05 15:37:50 +02:00
..
platformsocketengine	Convert uses of QTime as a timer to QElapsedTimer	2019-06-14 10:42:33 +02:00
qabstractsocket	Updated license headers	2016-01-21 18:55:18 +00:00
qhttpsocketengine	Convert uses of QTime as a timer to QElapsedTimer	2019-06-14 10:42:33 +02:00
qlocalsocket	Convert uses of QTime as a timer to QElapsedTimer	2019-06-14 10:42:33 +02:00
qsctpsocket	Network: Use canonical license headers	2017-02-28 15:34:01 +00:00
qsocks5socketengine	Expose docker test server as an internal config to all modules	2019-04-25 15:33:06 +00:00
qtcpserver	Remove usages of Q_OS_WINCE	2019-05-23 13:51:05 +02:00
qtcpsocket	Merge remote-tracking branch 'origin/5.13' into dev	2019-07-05 15:37:50 +02:00
qudpsocket	Convert uses of QTime as a timer to QElapsedTimer	2019-06-14 10:42:33 +02:00
socket.pro	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00