1 files changed, 43 insertions, 30 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index 922589ce67..9fd93ca91d 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QTest>
@@ -146,8 +146,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:
@@ -942,9 +950,9 @@ void tst_QGraphicsWidget::geometry()
     widget.setPos(pos);
     widget.resize(size);
     if (!size.isNull() && !pos.isNull())
-        QCOMPARE(spy.count(), 2);
+        QCOMPARE(spy.size(), 2);
     if (!size.isNull() && pos.isNull())
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
     QCOMPARE(widget.geometry(), QRectF(pos, size));
 }
 
@@ -955,10 +963,10 @@ void tst_QGraphicsWidget::geometryChanged()
     QCOMPARE(w.geometry(), QRectF(0, 0, 200, 200));
     QSignalSpy spy(&w, SIGNAL(geometryChanged()));
     w.setGeometry(0, 0, 100, 100);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(w.geometry(), QRectF(0, 0, 100, 100));
     w.setPos(10, 10);
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
     QCOMPARE(w.geometry(), QRectF(10, 10, 100, 100));
 
 }
@@ -970,10 +978,10 @@ void tst_QGraphicsWidget::width()
     QSignalSpy spy(&w, SIGNAL(widthChanged()));
     w.setProperty("width", qreal(50));
     QCOMPARE(w.property("width").toReal(), qreal(50));
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     //calling old school setGeometry should work too
     w.setGeometry(0, 0, 200, 200);
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
 }
 
 void tst_QGraphicsWidget::height()
@@ -983,10 +991,10 @@ void tst_QGraphicsWidget::height()
     QSignalSpy spy(&w, SIGNAL(heightChanged()));
     w.setProperty("height", qreal(50));
     QCOMPARE(w.property("height").toReal(), qreal(50));
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     //calling old school setGeometry should work too
     w.setGeometry(0, 0, 200, 200);
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
 }
 
 void tst_QGraphicsWidget::getContentsMargins_data()
@@ -1051,7 +1059,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;
@@ -1065,10 +1076,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) {
@@ -1087,8 +1100,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)
@@ -1125,12 +1140,12 @@ void tst_QGraphicsWidget::layout()
     widget.setLayout(layout);
 
     QTRY_COMPARE(widget.layout(), static_cast<QGraphicsLayout*>(layout));
-    for (int i = 0; i < children.count(); ++i) {
+    for (int i = 0; i < children.size(); ++i) {
         SubQGraphicsWidget *item = children[i];
         QCOMPARE(item->parentWidget(), (QGraphicsWidget *)&widget);
         QVERIFY(item->geometry() != QRectF(0, 0, -1, -1));
     }
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     // don't crash
     widget.setLayout(0);
 }
@@ -1163,7 +1178,7 @@ void tst_QGraphicsWidget::layoutDirection()
     QCOMPARE(widget.testAttribute(Qt::WA_SetLayoutDirection), true);
     view->show();
     QVERIFY(QTest::qWaitForWindowExposed(view.data()));
-    for (int i = 0; i < children.count(); ++i) {
+    for (int i = 0; i < children.size(); ++i) {
         QTRY_COMPARE(children[i]->layoutDirection(), layoutDirection);
         QTRY_COMPARE(children[i]->testAttribute(Qt::WA_SetLayoutDirection), false);
         view->update();
@@ -1373,7 +1388,6 @@ void tst_QGraphicsWidget::setTabOrder()
     QGraphicsScene scene;
     QGraphicsView view(&scene);
     view.show();
-    QApplicationPrivate::setActiveWindow(&view);
     QVERIFY(QTest::qWaitForWindowActive(&view));
 
     QGraphicsWidget *lastItem = nullptr;
@@ -1401,7 +1415,7 @@ void tst_QGraphicsWidget::setTabOrder()
         QVERIFY(view.viewport()->hasFocus());
 
         int currentItem = 0;
-        while (currentItem < children.count() - 1) {
+        while (currentItem < children.size() - 1) {
             QTest::keyPress(view.viewport(), Qt::Key_Tab);
             ++currentItem;
             QVERIFY(children[currentItem % children.size()]->hasFocus());
@@ -1445,7 +1459,6 @@ void tst_QGraphicsWidget::setTabOrderAndReparent()
     QGraphicsScene scene;
     QGraphicsView view(&scene);
     view.show();
-    QApplicationPrivate::setActiveWindow(&view);
     QVERIFY(QTest::qWaitForWindowActive(&view));
     QCOMPARE(QApplication::activeWindow(), (QWidget*)&view);
 
@@ -1550,7 +1563,7 @@ void tst_QGraphicsWidget::unsetLayoutDirection()
     widget.setLayoutDirection(layoutDirection);
     widget.unsetLayoutDirection();
     QCOMPARE(widget.testAttribute(Qt::WA_SetLayoutDirection), false);
-    for (int i = 0; i < children.count(); ++i) {
+    for (int i = 0; i < children.size(); ++i) {
         QCOMPARE(children[i]->layoutDirection(), Qt::LeftToRight);
     }
 }
@@ -1575,7 +1588,6 @@ void tst_QGraphicsWidget::verifyFocusChain()
     QGraphicsScene scene;
     QGraphicsView view(&scene);
     view.show();
-    QApplicationPrivate::setActiveWindow(&view);
     QVERIFY(QTest::qWaitForWindowActive(&view));
 
     {
@@ -1667,7 +1679,6 @@ void tst_QGraphicsWidget::verifyFocusChain()
         w1_2->setFocusPolicy(Qt::StrongFocus);
         scene.addItem(w1_2);
         window->show();
-        QApplicationPrivate::setActiveWindow(window.data());
         QVERIFY(QTest::qWaitForWindowActive(window.data()));
 
         lineEdit->setFocus();
@@ -1715,6 +1726,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);
@@ -1909,7 +1923,7 @@ void tst_QGraphicsWidget::setSizes()
     QSizeF max = QSizeF(50, 50);
 
     int i;
-    for (i = 0; i < inputInstructions.count(); ++i) {
+    for (i = 0; i < inputInstructions.size(); ++i) {
         Inst input = inputInstructions.at(i);
 
         // defaults
@@ -1963,7 +1977,7 @@ void tst_QGraphicsWidget::setSizes()
     widget->setPreferredSize(pref);
     widget->setMaximumSize(max);
 
-    for (i = 0; i < compareInstructions.count(); ++i) {
+    for (i = 0; i < compareInstructions.size(); ++i) {
         Inst input = compareInstructions.at(i);
         switch (input.first) {
             case MinimumSize:
@@ -2676,7 +2690,6 @@ void tst_QGraphicsWidget::task250119_shortcutContext()
     QGraphicsView view;
     view.setScene(&scene);
     view.show();
-    QApplicationPrivate::setActiveWindow(&view);
     QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view);
 
 
@@ -2713,11 +2726,11 @@ void tst_QGraphicsWidget::task250119_shortcutContext()
 
     w_signal.setFocus();
     QTest::keyPress(&view, Qt::Key_B);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     w_signal.clearFocus();
     QTest::keyPress(&view, Qt::Key_B);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     scene.removeItem(&w_signal);
 }