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
..
qaction	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
qactiongroup	Updated license headers	2016-01-21 18:55:18 +00:00
qapplication	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qboxlayout	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
qdesktopwidget	Updated license headers	2016-01-21 18:55:18 +00:00
qformlayout	testlib: start sharing common helper functions	2017-11-04 20:11:22 +00:00
qgesturerecognizer	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qgridlayout	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
qlayout	testlib: start sharing common helper functions	2017-11-04 20:11:22 +00:00
qshortcut	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qsizepolicy	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qstackedlayout	Plug memleaks in tst_QStackedLayout	2017-01-14 18:17:47 +00:00
qtooltip	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qwidget	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
qwidget_window	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
qwidgetaction	testlib: start sharing common helper functions	2017-11-04 20:11:22 +00:00
qwidgetmetatype	Updated license headers	2016-01-21 18:55:18 +00:00
qwidgetsvariant	Updated license headers	2016-01-21 18:55:18 +00:00
qwindowcontainer	Fix crash when reparenting window container	2017-09-28 12:09:27 +00:00
kernel.pro	Move QGestureRecognizer test to widgets/kernel	2017-06-02 18:36:11 +00:00