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
..
qtconcurrentfilter	Updated license headers	2016-01-21 18:55:18 +00:00
qtconcurrentiteratekernel	Remove tst_qtconcurrentiteratekernel blockSize test	2017-07-29 09:35:16 +00:00
qtconcurrentmap	Change almost all other uses of qrand() to QRandomGenerator	2017-11-08 09:14:03 +00:00
qtconcurrentmedian	Updated license headers	2016-01-21 18:55:18 +00:00
qtconcurrentrun	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qtconcurrentthreadengine	Updated license headers	2016-01-21 18:55:18 +00:00
concurrent.pro	QtConcurrent: Workaround GCC bug 58800 in median calculation	2013-12-03 11:45:18 +01:00