Liang Qi 305dd1b61f Merge remote-tracking branch 'origin/5.9' into 5.11 ... Conflicts: .qmake.conf src/corelib/animation/qvariantanimation.cpp src/corelib/global/qglobal.cpp src/corelib/global/qlogging.cpp src/corelib/io/qprocess_win.cpp src/corelib/json/qjsonarray.cpp src/corelib/tools/qsimd_p.h src/corelib/tools/qtimezoneprivate_p.h src/corelib/xml/qxmlstream_p.h src/gui/kernel/qsimpledrag.cpp src/gui/kernel/qsimpledrag_p.h src/plugins/generic/generic.pro src/plugins/platforms/cocoa/qcocoamenu.mm src/widgets/styles/qmacstyle_mac.mm tests/auto/concurrent/qtconcurrentmap/BLACKLIST tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qmessagebox/BLACKLIST Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e		2018-02-14 12:51:24 +01: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	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +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	Fix tst_QTcpServer::maxPendingConnections flakiness	2018-02-09 18:45:25 +00:00
qtcpsocket	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
qudpsocket	Merge remote-tracking branch 'origin/5.9' into 5.10	2018-01-07 14:47:19 +01:00
socket.pro	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00