From 420b8c0169792cc21fdbfa29f6cbd20191e28489 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Mon, 2 Jan 2023 16:59:10 +0100
Subject: [PATCH] tests: skip tst_QComboBox::cancelClosesPopupNotDialog() on
 Wayland
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QWindow::requestActivate() is not supported.

This amends c95de359b4fe7bc03f7defdb057ebbe79c51b3dd.

Task-number: QTBUG-107153
Change-Id: I45f53b5e9de85049ca41cc139a78a82450f53bed
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit f09f516ac149a723d3b00b8ecc746c12eb970465)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index d5047dd6ae2..4b7ed29fff3 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>
@@ -3633,6 +3634,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"});