1 files changed, 27 insertions, 7 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index ba0e4b223c..782cb1b2f5 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -42,6 +42,8 @@
 #include <qstylefactory.h>
 #include <qscreen.h>
 #include <qsignalspy.h>
+#include <private/qguiapplication_p.h>
+#include <qpa/qplatformintegration.h>
 
 typedef QList<QGraphicsItem *> QGraphicsItemList;
 
@@ -169,8 +171,16 @@ private slots:
     void QT_BUG_6544_tabFocusFirstUnsetWhenRemovingItems();
     void QT_BUG_12056_tabFocusFirstUnsetWhenRemovingItems();
     void QTBUG_45867_send_itemChildAddedChange_to_parent();
+
+private:
+    static bool hasWindowActivation();
 };
 
+bool tst_QGraphicsWidget::hasWindowActivation()
+{
+    return (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation));
+}
+
 // Subclass that exposes the protected functions.
 class SubQGraphicsWidget : public QGraphicsWidget {
 public:
@@ -1074,7 +1084,10 @@ void tst_QGraphicsWidget::initStyleOption()
     QGraphicsView view(&scene);
     view.resize(300, 300);
     view.show();
-    QVERIFY(QTest::qWaitForWindowActive(&view));
+    if (hasWindowActivation())
+        QVERIFY(QTest::qWaitForWindowActive(&view));
+    else
+        QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     view.setAlignment(Qt::AlignTop | Qt::AlignLeft);
     SubQGraphicsWidget *widget = new SubQGraphicsWidget;
@@ -1088,10 +1101,12 @@ void tst_QGraphicsWidget::initStyleOption()
     QFETCH(bool, enabled);
     widget->setEnabled(enabled);
     QFETCH(bool, focus);
-    if (focus) {
-        widget->setFlag(QGraphicsItem::ItemIsFocusable, true);
-        widget->setFocus();
-        QVERIFY(widget->hasFocus());
+    if (hasWindowActivation()) {
+        if (focus) {
+            widget->setFlag(QGraphicsItem::ItemIsFocusable, true);
+            widget->setFocus();
+            QVERIFY(widget->hasFocus());
+        }
     }
     QFETCH(bool, underMouse);
     if (underMouse) {
@@ -1110,8 +1125,10 @@ void tst_QGraphicsWidget::initStyleOption()
 
     bool isEnabled = option.state & QStyle::State_Enabled;
     QCOMPARE(isEnabled, enabled);
-    bool hasFocus = option.state & QStyle::State_HasFocus;
-    QCOMPARE(hasFocus, focus);
+    if (hasWindowActivation()) {
+        bool hasFocus = option.state & QStyle::State_HasFocus;
+        QCOMPARE(hasFocus, focus);
+    }
     bool isUnderMouse = option.state & QStyle::State_MouseOver;
     QCOMPARE(isUnderMouse, underMouse);
     // if (layoutDirection != Qt::LeftToRight)
@@ -1738,6 +1755,9 @@ void tst_QGraphicsWidget::verifyFocusChain()
 
 void tst_QGraphicsWidget::updateFocusChainWhenChildDie()
 {
+    if (!hasWindowActivation())
+        QSKIP("Window activation is not supported");
+
     const QRect availableGeometry = QGuiApplication::primaryScreen()->availableGeometry();
     QGraphicsScene scene;
     QGraphicsView view(&scene);