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
..
animation	Updated license headers	2016-01-21 18:55:18 +00:00
graphicsview	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
image	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00
itemviews	Updated license headers	2016-01-21 18:55:18 +00:00
kernel	Ensure result of all QTest::qWaitFor are verified	2017-10-05 15:15:36 +00:00
math3d	Updated license headers	2016-01-21 18:55:18 +00:00
painting	Change almost all other uses of qrand() to QRandomGenerator	2017-11-08 09:14:03 +00:00
styles	Ensure result of all QTest::qWaitFor are verified	2017-10-05 15:15:36 +00:00
text	Improve performance of Qt::mightBeRichText by using QStringRef	2016-07-11 12:30:31 +00:00
gui.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00