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
..
testData/render	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
Ash_European.jpg	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
BLACKLIST	Blacklist tst_QGraphicsScene::isActive in openSUSE 42.3	2017-09-20 09:48:36 +00:00
graphicsScene_selection.data	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
images.qrc	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
qgraphicsscene.pro	QtWidgets: Remove Windows CE.	2016-04-07 10:24:45 +00:00
testdata.qrc	Android: Fix some QGraphicsScene tests	2016-01-20 07:48:34 +00:00
tst_qgraphicsscene.cpp	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00