From 324887779d272364a1dfa32bb0a2a46a71a839e8 Mon Sep 17 00:00:00 2001
From: Andreas Buhr <andreas.buhr@qt.io>
Date: Tue, 22 Feb 2022 15:39:38 +0100
Subject: [PATCH] Activate tst_qmenu for Android

tst_qmenu was disabled because it crashed.
It does not any more.

Task-number: QTBUG-87671
Task-number: QTBUG-87424
Pick-to: 6.2 6.3
Change-Id: I1a3a1d2861b5a8f20d83fd8ba38fdcb3c88faee9
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
---
 tests/auto/widgets/widgets/CMakeLists.txt      | 3 +--
 tests/auto/widgets/widgets/qmenu/BLACKLIST     | 3 +++
 tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 9 ++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/auto/widgets/widgets/CMakeLists.txt b/tests/auto/widgets/widgets/CMakeLists.txt
index 6a53c60e77..e3e8aba925 100644
--- a/tests/auto/widgets/widgets/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/CMakeLists.txt
@@ -46,13 +46,12 @@ endif()
 if(QT_FEATURE_shortcut)
     add_subdirectory(qkeysequenceedit)
 endif()
+add_subdirectory(qmenu)
 if(NOT ANDROID)
     # QTBUG-87417 # special case
     add_subdirectory(qlineedit)
     # QTBUG-87420 # special case
     add_subdirectory(qmdiarea)
-    # QTBUG-87671 # special case
-    add_subdirectory(qmenu)
     # QTBUG-87421 # special case
     add_subdirectory(qmenubar)
 endif()
diff --git a/tests/auto/widgets/widgets/qmenu/BLACKLIST b/tests/auto/widgets/widgets/qmenu/BLACKLIST
index 230512769c..be4764764d 100644
--- a/tests/auto/widgets/widgets/qmenu/BLACKLIST
+++ b/tests/auto/widgets/widgets/qmenu/BLACKLIST
@@ -29,3 +29,6 @@ android
 [QTBUG_89082_actionTipsHide]
 macos ci # Can't move cursor (QTBUG-76312)
 windows-10 ci
+# QTBUG-87424
+[transientParent]
+android
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 31ecd024c0..e6dd508202 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -918,13 +918,20 @@ private:
 
 void tst_QMenu::activeSubMenuPositionExec()
 {
-
+#ifdef Q_OS_ANDROID
+    // QTBUG-87424
+    QSKIP("Android: This hangs. Figure out why.");
+#endif
     SubMenuPositionExecMenu menu;
     menu.exec(QGuiApplication::primaryScreen()->availableGeometry().center());
 }
 
 void tst_QMenu::task242454_sizeHint()
 {
+#ifdef Q_OS_ANDROID
+    // QTBUG-87424
+    QSKIP("Android: This hangs. Figure out why.");
+#endif
     QMenu menu;
     QString s = QLatin1String("foo\nfoo\nfoo\nfoo");
     menu.addAction(s);