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
..
qgraphicsanchorlayout	Updated license headers	2016-01-21 18:55:18 +00:00
qgraphicsanchorlayout1	Updated license headers	2016-01-21 18:55:18 +00:00
qgraphicseffectsource	Updated license headers	2016-01-21 18:55:18 +00:00
qgraphicsgridlayout	Fix layout tests for GCC 5.2.x/5.3.x	2017-03-30 06:58:07 +00:00
qgraphicsitem	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
qgraphicsitemanimation	tests/auto/widgets: use QCOMPARE(., nullptr)	2016-11-30 07:24:47 +00:00
qgraphicslayout	tests/auto/widgets: use QCOMPARE(., nullptr)	2016-11-30 07:24:47 +00:00
qgraphicslayoutitem	tests/auto/widgets: use QCOMPARE(., nullptr)	2016-11-30 07:24:47 +00:00
qgraphicslinearlayout	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qgraphicsobject	Updated license headers	2016-01-21 18:55:18 +00:00
qgraphicspixmapitem	Updated license headers	2016-01-21 18:55:18 +00:00
qgraphicspolygonitem	Updated license headers	2016-01-21 18:55:18 +00:00
qgraphicsproxywidget	Remove references to obsolete platforms	2017-11-05 06:33:53 +00:00
qgraphicsscene	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
qgraphicssceneindex	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00
qgraphicstransform	Updated license headers	2016-01-21 18:55:18 +00:00
qgraphicsview	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-11-09 11:47:57 +01:00
qgraphicswidget	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
graphicsview.pro	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00