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
..
hpack	Change almost all other uses of qrand() to QRandomGenerator	2017-11-08 09:14:03 +00:00
hsts	Introduce QHstsStore - the permanent store for HSTS policies	2017-08-02 22:01:47 +00:00
http2	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
qabstractnetworkcache	qabstractnetworkcache - enable several tests	2016-01-26 13:12:03 +00:00
qftp	Change almost all other uses of qrand() to QRandomGenerator	2017-11-08 09:14:03 +00:00
qhttpnetworkconnection	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00
qhttpnetworkreply	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qnetworkaccessmanager	Updated license headers	2016-01-21 18:55:18 +00:00
qnetworkcachemetadata	Updated license headers	2016-01-21 18:55:18 +00:00
qnetworkcookie	Add qtest_network.h	2016-09-29 21:46:19 +00:00
qnetworkcookiejar	Fix cookie path matching for empty url path	2017-10-19 12:51:38 +00:00
qnetworkdiskcache	Change almost all other uses of qrand() to QRandomGenerator	2017-11-08 09:14:03 +00:00
qnetworkreply	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
qnetworkrequest	Add qtest_network.h	2016-09-29 21:46:19 +00:00
spdy	Updated license headers	2016-01-21 18:55:18 +00:00
access.pro	Add HTTP strict tranport security support to QNAM	2017-01-20 08:41:50 +00:00