Liang Qi 153e8b49ad Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: src/network/access/qhttp2protocolhandler_p.h src/network/kernel/kernel.pri src/network/ssl/qsslkey_qt.cpp src/plugins/platforms/cocoa/qcocoascreen.mm src/plugins/platforms/windows/accessible/iaccessible2.cpp src/plugins/platforms/windows/accessible/iaccessible2.h src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h src/widgets/widgets/qmenu_p.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/other/qaccessibility/tst_qaccessibility.cpp tests/auto/testlib/selftests/expected_cmptest.lightxml tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/testlib/selftests/expected_cmptest.xml Done-with: Edward Welbourne <edward.welbourne@qt.io> Change-Id: I4217cc7d840cbae3e3dd28574741544469c4c6b9		2017-11-23 09:36:03 +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	Convert features.socks5 to QT_[REQUIRE_]CONFIG	2017-09-06 06:50:54 +00:00
qtcpsocket	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
qudpsocket	qudpsocket.pro - fix dependencies	2017-11-07 09:23:38 +00:00
socket.pro	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00