1 files changed, 18 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
index dfcef43a7e..0993d03ee4 100644
--- a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
+++ b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
@@ -60,6 +60,7 @@ private slots:
     void state();
     void layoutDirection();
     void inputMethod();
+    void cleanup();
 
 private:
     QQmlEngine engine;
@@ -69,6 +70,14 @@ tst_qquickapplication::tst_qquickapplication()
 {
 }
 
+void tst_qquickapplication::cleanup()
+{
+    if (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ApplicationState)) {
+        QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationInactive);
+        QTest::waitForEvents();
+    }
+}
+
 void tst_qquickapplication::active()
 {
     QQmlComponent component(&engine);
@@ -98,12 +107,19 @@ void tst_qquickapplication::active()
     QVERIFY(item->property("active").toBool());
     QVERIFY(item->property("active2").toBool());
 
-    // not active again
     QWindowSystemInterface::handleWindowActivated(0);
 
+#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
 }
 
 void tst_qquickapplication::state()
@@ -117,6 +133,7 @@ void tst_qquickapplication::state()
                       "        target: Qt.application; "
                       "        onStateChanged: state2 = Qt.application.state; "
                       "    } "
+                      "    Component.onCompleted: state2 = Qt.application.state; "
                       "}", QUrl::fromLocalFile(""));
     QQuickItem *item = qobject_cast<QQuickItem *>(component.create());
     QVERIFY(item);