summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndreas Buhr <andreas.buhr@qt.io>2022-02-22 14:49:04 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-02-24 14:14:43 +0000
commitb43c25f4a165bcdd2b17855c437c543300b11f24 (patch)
tree37c23e0085dfc821124206708d5c8404912a23da /tests
parent545eccbd10d5a13f80ee1e357c924f23ac26d2ad (diff)
Activate tst_qgraphicsview for Android
tst_qgraphicsview was disabled because it crashed. It does not any more. Task-number: QTBUG-87671 Task-number: QTBUG-87397 Change-Id: Ib604274d098c271e22b010e6cb822fdf9553df1c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Samuel Mira <samuel.mira@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit fcb5e5222875cdb438dbc4cc6a00f43e35d93b57) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/widgets/graphicsview/CMakeLists.txt5
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST6
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/auto/widgets/graphicsview/CMakeLists.txt b/tests/auto/widgets/graphicsview/CMakeLists.txt
index df3c4d4369..b480a04a8c 100644
--- a/tests/auto/widgets/graphicsview/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/CMakeLists.txt
@@ -19,7 +19,4 @@ add_subdirectory(qgraphicspolygonitem)
add_subdirectory(qgraphicstransform)
add_subdirectory(qgraphicsproxywidget)
add_subdirectory(qgraphicswidget)
-# QTBUG-87671 # special case
-if(NOT ANDROID)
- add_subdirectory(qgraphicsview)
-endif()
+add_subdirectory(qgraphicsview)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST b/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST
index fe3d929e9e..5ca22dfbda 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST
@@ -45,3 +45,9 @@ android
android
[update_ancestorClipsChildrenToShape2]
android
+[QTBUG_70255_scrollTo]
+android # QTBUG-87397
+[embeddedViewsWithFocus]
+android # QTBUG-87397
+[viewportUpdateMode2]
+android # QTBUG-87397