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
..
image	Change almost all other uses of qrand() to QRandomGenerator	2017-11-08 09:14:03 +00:00
itemmodels	Correct QStandardItemModel::setItemData to follow QAbstractItemModel	2017-10-17 12:28:23 +00:00
kernel	Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev	2017-11-06 14:25:20 +00:00
math3d	Use qRadiansToDegrees() and qDegreesToRadians() more widely	2017-07-05 10:15:34 +00:00
painting	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
qopengl	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-24 13:40:55 +02:00
qopenglconfig	Fix tst_QOpenGlConfig for platforms with builtin test data	2017-06-19 07:05:59 +00:00
qvulkan	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
text	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
util	GLSL 1.00 ES must be selected using "#version 100"	2017-08-04 11:19:30 +00:00
gui.pro	Basic Vulkan enablers	2017-03-17 16:12:03 +00:00