Liang Qi bb0fec8057 Merge remote-tracking branch 'origin/5.10' into 5.11 ... Conflicts: src/corelib/corelib.pro src/corelib/global/qrandom.cpp src/network/access/qhttpnetworkrequest_p.h src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/cocoa/qcocoansmenu.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/offscreen/qoffscreenintegration.h src/widgets/kernel/qaction.cpp src/widgets/widgets.pro Done-with: Andy Shaw <andy.shaw@qt.io> Change-Id: Ib01547cf4184023f19858ccf0ce7fb824fed2a8d		2018-02-15 10:14:11 +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 5.11	2018-02-15 10:14:11 +01:00