Liang Qi 19dd2ca93b Merge remote-tracking branch 'origin/5.9' into 5.10 ... Conflicts: examples/opengl/qopenglwidget/main.cpp src/3rdparty/pcre2/src/pcre2_printint.c src/plugins/platforms/cocoa/qnsview.mm src/widgets/widgets/qcombobox.cpp Change-Id: I37ced9da1e8056f95851568bcc52cd5dc34f56af		2017-09-06 13:26:31 +02:00
..
platformsocketengine	QNativeSocketEngine: disable unused methods about OS socket buffer	2017-09-01 16:40:36 +00:00
qabstractsocket	Updated license headers	2016-01-21 18:55:18 +00:00
qhttpsocketengine	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00
qlocalsocket	Add QLocalServer::socketDescriptor	2017-06-06 17:46:50 +00:00
qsctpsocket	Network: Use canonical license headers	2017-02-28 15:34:01 +00:00
qsocks5socketengine	tst_QSocks5SocketEngine::downloadBigFile(): Output elapsed time	2017-06-28 17:54:07 +00:00
qtcpserver	Convert features.socks5 to QT_[REQUIRE_]CONFIG	2017-09-06 06:50:54 +00:00
qtcpsocket	Properly use the "process" feature	2017-02-27 15:44:46 +00:00
qudpsocket	Convert features.socks5 to QT_[REQUIRE_]CONFIG	2017-09-06 06:50:54 +00:00
socket.pro	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00