whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Andreas Buhr 2022-02-22 15:39:38 +01:00
parent a1b90caad5
commit 324887779d
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/widgets/widgets/CMakeLists.txt
View File

@ -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()

3
tests/auto/widgets/widgets/qmenu/BLACKLIST
View File

@ -29,3 +29,6 @@ android
[QTBUG_89082_actionTipsHide]
macos ci # Can't move cursor (QTBUG-76312)
windows-10 ci
# QTBUG-87424
[transientParent]
android

9
tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
View File

@ -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);