From 37270a44a2589b15de1c6b6c82b163fa96e7a4a2 Mon Sep 17 00:00:00 2001 From: Janne Juntunen Date: Tue, 29 Mar 2022 14:55:35 +0300 Subject: tst_qquickmenubar: skip some tests on webOS It appears that webOS emulator environment or platform itself has some custom behavior which prevents using standard tests. Fixes: QTBUG-102120 Pick-to: 6.3 Change-Id: Ifbbb35e1fa6ef897527c3f9b91c6b9edd131f14c Reviewed-by: Mitch Curtis --- .../quickcontrols2/qquickmenubar/tst_qquickmenubar.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/auto/quickcontrols2/qquickmenubar/tst_qquickmenubar.cpp b/tests/auto/quickcontrols2/qquickmenubar/tst_qquickmenubar.cpp index 1e718ff193..584ce74016 100644 --- a/tests/auto/quickcontrols2/qquickmenubar/tst_qquickmenubar.cpp +++ b/tests/auto/quickcontrols2/qquickmenubar/tst_qquickmenubar.cpp @@ -192,9 +192,10 @@ void tst_qquickmenubar::mouse() QQuickMenu *alignmentSubMenu = alignmentSubMenuItem->subMenu(); QVERIFY(alignmentSubMenu); QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, alignmentSubMenuItem->mapToScene(QPointF(alignmentSubMenuItem->width() / 2, alignmentSubMenuItem->height() / 2)).toPoint()); -#ifndef Q_OS_ANDROID +#if !defined(Q_OS_ANDROID) and !defined(Q_OS_WEBOS) // The screen on Android is too small to fit the whole hierarchy, so the // Alignment sub-menu is shown on top of View menu. + // WebOS also shows alignment sub-menu on top of View menu. QVERIFY(viewMenuBarMenu->isVisible()); #endif QVERIFY(alignmentSubMenu->isVisible()); @@ -206,9 +207,10 @@ void tst_qquickmenubar::mouse() QQuickMenu *verticalSubMenu = verticalSubMenuItem->subMenu(); QVERIFY(verticalSubMenu); QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, verticalSubMenuItem->mapToScene(QPointF(verticalSubMenuItem->width() / 2, verticalSubMenuItem->height() / 2)).toPoint()); -#ifndef Q_OS_ANDROID +#if !defined(Q_OS_ANDROID) and !defined(Q_OS_WEBOS) // The screen on Android is too small to fit the whole hierarchy, so the // Vertical sub-menu is shown on top of View menu and Alignment sub-menu. + // WebOS also shows vertical sub-menu on top of View menu and Alignment sub-menu. QVERIFY(viewMenuBarMenu->isVisible()); QVERIFY(alignmentSubMenu->isVisible()); #endif @@ -296,6 +298,11 @@ void tst_qquickmenubar::keys() QVERIFY(editMenuBarItem->isHighlighted()); QVERIFY(editMenuBarItem->hasActiveFocus()); QTRY_VERIFY(!editMenuBarMenu->isVisible()); + +// There seem to be problems in focus handling in webOS QPA, see https://bugreports.qt.io/browse/WEBOSCI-45 +#ifdef Q_OS_WEBOS + QEXPECT_FAIL("", "WEBOSCI-45", Abort); +#endif QVERIFY(!cutMenuItem->isHighlighted()); QVERIFY(!cutMenuItem->hasActiveFocus()); @@ -434,8 +441,8 @@ void tst_qquickmenubar::keys() void tst_qquickmenubar::mnemonics() { -#ifdef Q_OS_MACOS - QSKIP("Mnemonics are not used on macOS"); +#if defined(Q_OS_MACOS) or defined(Q_OS_WEBOS) + QSKIP("Mnemonics are not used on this platform"); #endif QQmlApplicationEngine engine(testFileUrl("menubar.qml")); -- cgit v1.2.3