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
..
dialogs	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
effects	Revert "QWidgetEffectSourcePrivate::draw(): Call render() when no shared painter exists"	2017-06-14 13:00:35 +00:00
graphicsview	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
itemviews	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
kernel	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
styles	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
util	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
widgets	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
widgets.pro	Move QGestureRecognizer test to widgets/kernel	2017-06-02 18:36:11 +00:00