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
..
main.cpp	tests: Unify license to GPL-EXCEPT	2017-04-03 07:18:46 +00:00
mainwindow.cpp	QCocoaMenu: Attach menu items when updating the menubar	2017-11-05 01:39:30 +00:00
mainwindow.h	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
mainwindow.ui	QCocoaMenu: Attach menu items when updating the menubar	2017-11-05 01:39:30 +00:00
menurama.pro	Cocoa Menus: Introducing Menurama manual test	2016-08-19 03:04:28 +00:00
menuramaapplication.cpp	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
menuramaapplication.h	tests: Unify license to GPL-EXCEPT	2017-04-03 07:18:46 +00:00