summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2021-10-10 09:37:20 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-10-11 17:12:54 +0000
commitaac4877f4c89eb52e1f0ff5c3bd707210ae350a2 (patch)
treeeec52cb984c7028b68c8b98b5bd821b3b630a960 /tests
parentd8eac9a71a4f951971d7cf3e20a72dba90800ac7 (diff)
Activate tst_QDialog::showAsTool test on macOS
The skip-reason only cites Qt/X11. Convert the #ifdef into a platform name check instead. The test also fails with the offscreen plugin, so skip it for that as well. Change-Id: I49607b89f4b32359e81e1d9aadff2c3e03035c53 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 9d26de4069b9899788212ab4314c3e13dd65e223) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
index c7e0c269d3..a7302cc6c6 100644
--- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
+++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
@@ -307,9 +307,8 @@ void tst_QDialog::showFullScreen()
void tst_QDialog::showAsTool()
{
-#if defined(Q_OS_UNIX)
- QSKIP("Qt/X11: Skipped since activeWindow() is not respected by all window managers");
-#endif
+ if (QStringList{"xcb", "offscreen"}.contains(QGuiApplication::platformName()))
+ QSKIP("activeWindow() is not respected by all Xcb window managers and the offscreen plugin");
DummyDialog testWidget;
testWidget.resize(200, 200);
testWidget.setWindowTitle(QTest::currentTestFunction());