summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2023-01-02 16:59:10 +0100
committerLiang Qi <liang.qi@qt.io>2023-01-03 12:07:43 +0100
commitf09f516ac149a723d3b00b8ecc746c12eb970465 (patch)
tree709b4dcdf7797925a5217ad7d63683a1e0737294 /tests/auto/widgets
parent71e67dec957d41d55ae03f32613a80394c928352 (diff)
tests: skip tst_QComboBox::cancelClosesPopupNotDialog() on Wayland
QWindow::requestActivate() is not supported. This amends c95de359b4fe7bc03f7defdb057ebbe79c51b3dd. Task-number: QTBUG-107153 Pick-to: 6.5 6.4 Change-Id: I45f53b5e9de85049ca41cc139a78a82450f53bed Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/widgets')
-rw-r--r--tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 4bbf8f7b5c..337a7fecaa 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -8,6 +8,7 @@
#include "qcombobox.h"
#include <private/qcombobox_p.h>
#include <private/qguiapplication_p.h>
+#include <qpa/qplatformintegration.h>
#include <qpa/qplatformtheme.h>
#include <qfontcombobox.h>
@@ -3642,6 +3643,9 @@ void tst_QComboBox::cancelClosesPopupNotDialog()
if (QGuiApplication::platformName() == "offscreen")
QSKIP("The offscreen platform plugin doesn't activate popups.");
+ if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+ QSKIP("QWindow::requestActivate() is not supported.");
+
QDialog dialog;
QComboBox combobox;
combobox.addItems({"A", "B", "C"});