Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	.qmake.conf
	tests/auto/quick/qquickpathview/tst_qquickpathview.cpp

Change-Id: Ic1f5e219a255d0613f7654368a5ce3eccb8f0ee9

1 files changed, 31 insertions, 25 deletions

diff --git a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
index 62027f59f4..3526eb98be 100644
--- a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
+++ b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
@@ -88,31 +88,37 @@ void tst_qquickapplication::active()
     QQuickWindow window;
     item->setParentItem(window.contentItem());
 
-    // not active
-    QVERIFY(!item->property("active").toBool());
-    QVERIFY(!item->property("active2").toBool());
-
-    // active
-    window.show();
-    window.requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(&window));
-    QCOMPARE(QGuiApplication::focusWindow(), &window);
-    QVERIFY(item->property("active").toBool());
-    QVERIFY(item->property("active2").toBool());
-
-    QWindowSystemInterface::handleWindowActivated(nullptr);
-
-#ifdef Q_OS_OSX
-    // OS X has the concept of "reactivation"
-    QTRY_VERIFY(QGuiApplication::focusWindow() != &window);
-    QVERIFY(item->property("active").toBool());
-    QVERIFY(item->property("active2").toBool());
-#else
-    // not active again
-    QTRY_VERIFY(QGuiApplication::focusWindow() != &window);
-    QVERIFY(!item->property("active").toBool());
-    QVERIFY(!item->property("active2").toBool());
-#endif
+    // If the platform plugin has the ApplicationState capability, app activation originate from it
+    // as a result of a system event. We therefore have to simulate these events here.
+    if (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ApplicationState)) {
+
+        // Flush pending events, in case the platform have already queued real application state events
+        QWindowSystemInterface::flushWindowSystemEvents();
+
+        QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
+        QWindowSystemInterface::flushWindowSystemEvents();
+        QVERIFY(item->property("active").toBool());
+        QVERIFY(item->property("active2").toBool());
+
+        QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationInactive);
+        QWindowSystemInterface::flushWindowSystemEvents();
+        QVERIFY(!item->property("active").toBool());
+        QVERIFY(!item->property("active2").toBool());
+    } else {
+        // Otherwise, app activation is triggered by window activation.
+        window.show();
+        window.requestActivate();
+        QVERIFY(QTest::qWaitForWindowActive(&window));
+        QCOMPARE(QGuiApplication::focusWindow(), &window);
+        QVERIFY(item->property("active").toBool());
+        QVERIFY(item->property("active2").toBool());
+
+        // not active again
+        QWindowSystemInterface::handleWindowActivated(nullptr);
+        QTRY_VERIFY(QGuiApplication::focusWindow() != &window);
+        QVERIFY(!item->property("active").toBool());
+        QVERIFY(!item->property("active2").toBool());
+    }
 }
 
 void tst_qquickapplication::state()