1 files changed, 72 insertions, 33 deletions
diff --git a/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp b/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp
index 8e25079703..549aae8c2b 100644
--- a/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp
+++ b/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp
@@ -70,6 +70,7 @@ private slots:
     void selfDelete();
     void contextDelete();
     void garbageCollection();
+    void requiredProperties();
 
 private:
     QQmlIncubationController controller;
@@ -148,7 +149,7 @@ void tst_qqmlincubator::objectDeleted()
         QVERIFY(!SelfRegisteringType::me());
 
         while (SelfRegisteringOuterType::me() == nullptr && incubator.isLoading()) {
-            bool b = false;
+            std::atomic<bool> b{false};
             controller.incubateWhile(&b);
         }
 
@@ -156,14 +157,14 @@ void tst_qqmlincubator::objectDeleted()
         QVERIFY(incubator.isLoading());
 
         while (SelfRegisteringType::me() == nullptr && incubator.isLoading()) {
-            bool b = false;
+            std::atomic<bool> b{false};
             controller.incubateWhile(&b);
         }
 
         delete SelfRegisteringType::me();
 
         {
-            bool b = true;
+            std::atomic<bool> b{true};
             controller.incubateWhile(&b);
         }
 
@@ -204,7 +205,7 @@ void tst_qqmlincubator::clear()
     component.create(incubator);
 
     while (SelfRegisteringType::me() == nullptr && incubator.isLoading()) {
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -223,7 +224,7 @@ void tst_qqmlincubator::clear()
     component.create(incubator);
 
     {
-        bool b = true;
+        std::atomic<bool> b{true};
         controller.incubateWhile(&b);
     }
 
@@ -317,7 +318,7 @@ void tst_qqmlincubator::forceCompletion()
     QVERIFY(incubator.isLoading());
 
     while (SelfRegisteringType::me() == nullptr && incubator.isLoading()) {
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -376,7 +377,7 @@ void tst_qqmlincubator::setInitialState()
     MyIncubator incubator(QQmlIncubator::Asynchronous);
     component.create(incubator);
     QVERIFY(incubator.isLoading());
-    bool b = true;
+    std::atomic<bool> b{true};
     controller.incubateWhile(&b);
     QVERIFY(incubator.isReady());
     QVERIFY(incubator.object());
@@ -413,7 +414,7 @@ void tst_qqmlincubator::clearDuringCompletion()
     QVERIFY(!CompletionRegisteringType::me());
 
     while (CompletionRegisteringType::me() == nullptr && incubator.isLoading()) {
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -452,7 +453,7 @@ void tst_qqmlincubator::objectDeletionAfterInit()
     component.create(incubator);
 
     while (!incubator.obj && incubator.isLoading()) {
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -551,7 +552,7 @@ void tst_qqmlincubator::statusChanged()
     QCOMPARE(incubator.statuses.at(0), int(QQmlIncubator::Loading));
 
     {
-    bool b = true;
+    std::atomic<bool> b{true};
     controller.incubateWhile(&b);
     }
 
@@ -573,7 +574,7 @@ void tst_qqmlincubator::statusChanged()
     QCOMPARE(incubator.statuses.at(0), int(QQmlIncubator::Loading));
 
     {
-    bool b = true;
+    std::atomic<bool> b{true};
     controller.incubateWhile(&b);
     }
 
@@ -621,7 +622,7 @@ void tst_qqmlincubator::asynchronousIfNested()
     QVERIFY(incubator.isLoading());
     QVERIFY(!SelfRegisteringType::me());
     while (SelfRegisteringType::me() == nullptr && incubator.isLoading()) {
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -634,7 +635,7 @@ void tst_qqmlincubator::asynchronousIfNested()
 
     while (nested.isLoading()) {
         QVERIFY(incubator.isLoading());
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -642,7 +643,7 @@ void tst_qqmlincubator::asynchronousIfNested()
     QVERIFY(incubator.isLoading());
 
     {
-        bool b = true;
+        std::atomic<bool> b{true};
         controller.incubateWhile(&b);
     }
 
@@ -741,7 +742,7 @@ void tst_qqmlincubator::chainedAsynchronousIfNested()
     QVERIFY(!SelfRegisteringType::me());
 
     while (SelfRegisteringType::me() == nullptr && incubator.isLoading()) {
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -778,7 +779,7 @@ void tst_qqmlincubator::chainedAsynchronousIfNested()
         QVERIFY(incubator1.isLoading());
         QVERIFY(incubator2.isNull());
 
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -791,14 +792,14 @@ void tst_qqmlincubator::chainedAsynchronousIfNested()
         QVERIFY(incubator1.isReady());
         QVERIFY(incubator2.isLoading());
 
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
     QVERIFY(incubator1.isReady());
     QVERIFY(incubator2.isReady());
     if (incubator.isLoading()) {
-        bool b = true;
+        std::atomic<bool> b{true};
         controller.incubateWhile(&b);
     }
 
@@ -855,7 +856,7 @@ void tst_qqmlincubator::chainedAsynchronousIfNestedOnCompleted()
     QVERIFY(!SelfRegisteringType::me());
 
     while (SelfRegisteringType::me() == nullptr && incubator.isLoading()) {
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -875,7 +876,7 @@ void tst_qqmlincubator::chainedAsynchronousIfNestedOnCompleted()
         QVERIFY(incubator2.isNull());
         QVERIFY(incubator3.isNull());
 
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -890,7 +891,7 @@ void tst_qqmlincubator::chainedAsynchronousIfNestedOnCompleted()
         QVERIFY(incubator2.isNull());
         QVERIFY(incubator3.isNull());
 
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -905,7 +906,7 @@ void tst_qqmlincubator::chainedAsynchronousIfNestedOnCompleted()
         QVERIFY(incubator2.isLoading());
         QVERIFY(incubator3.isNull());
 
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -920,12 +921,12 @@ void tst_qqmlincubator::chainedAsynchronousIfNestedOnCompleted()
         QVERIFY(incubator2.isReady());
         QVERIFY(incubator3.isLoading());
 
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
     {
-    bool b = true;
+    std::atomic<bool> b{true};
     controller.incubateWhile(&b);
     }
 
@@ -983,7 +984,7 @@ void tst_qqmlincubator::chainedAsynchronousClear()
     QVERIFY(!SelfRegisteringType::me());
 
     while (SelfRegisteringType::me() == nullptr && incubator.isLoading()) {
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -1003,7 +1004,7 @@ void tst_qqmlincubator::chainedAsynchronousClear()
         QVERIFY(incubator2.isNull());
         QVERIFY(incubator3.isNull());
 
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -1018,7 +1019,7 @@ void tst_qqmlincubator::chainedAsynchronousClear()
         QVERIFY(incubator2.isNull());
         QVERIFY(incubator3.isNull());
 
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -1033,7 +1034,7 @@ void tst_qqmlincubator::chainedAsynchronousClear()
         QVERIFY(incubator2.isLoading());
         QVERIFY(incubator3.isNull());
 
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -1077,7 +1078,7 @@ void tst_qqmlincubator::selfDelete()
 #define DELETE_TEST(status, mode) { \
     bool done = false; \
     component.create(*(new MyIncubator(&done, status, mode))); \
-    bool True = true; \
+    std::atomic<bool> True{true}; \
     controller.incubateWhile(&True); \
     QVERIFY(done == true); \
     }
@@ -1106,7 +1107,7 @@ void tst_qqmlincubator::selfDelete()
     QVERIFY(!SelfRegisteringType::me());
 
     while (SelfRegisteringType::me() == nullptr && incubator->isLoading()) {
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 
@@ -1120,7 +1121,7 @@ void tst_qqmlincubator::selfDelete()
     delete SelfRegisteringType::me();
 
     {
-    bool b = true;
+    std::atomic<bool> b{true};
     controller.incubateWhile(&b);
     }
 
@@ -1141,7 +1142,7 @@ void tst_qqmlincubator::contextDelete()
     delete context;
 
     {
-        bool b = false;
+        std::atomic<bool> b{false};
         controller.incubateWhile(&b);
     }
 }
@@ -1154,7 +1155,7 @@ void tst_qqmlincubator::garbageCollection()
 
     engine.collectGarbage();
 
-    bool b = true;
+    std::atomic<bool> b{true};
     controller.incubateWhile(&b);
 
     // verify incubation completed (the incubator was not prematurely collected)
@@ -1174,6 +1175,44 @@ void tst_qqmlincubator::garbageCollection()
     QVERIFY(weakIncubatorRef.isNullOrUndefined());
 }
 
+void tst_qqmlincubator::requiredProperties()
+{
+    {
+        QQmlComponent component(&engine, testFileUrl("requiredProperty.qml"));
+        QVERIFY(component.isReady());
+        // forceCompletion immediately after creating an asynchronous object completes it
+        QQmlIncubator incubator;
+        incubator.setInitialProperties({{"requiredProperty", 42}});
+        QVERIFY(incubator.isNull());
+        component.create(incubator);
+        QVERIFY(incubator.isLoading());
+
+        incubator.forceCompletion();
+
+        QVERIFY(incubator.isReady());
+        QVERIFY(incubator.object() != nullptr);
+        QCOMPARE(incubator.object()->property("requiredProperty").toInt(), 42);
+
+        delete incubator.object();
+    }
+    {
+        QQmlComponent component(&engine, testFileUrl("requiredProperty.qml"));
+        QVERIFY(component.isReady());
+        // forceCompletion immediately after creating an asynchronous object completes it
+        QQmlIncubator incubator;
+        QVERIFY(incubator.isNull());
+        component.create(incubator);
+        QVERIFY(incubator.isLoading());
+
+        incubator.forceCompletion();
+
+        QVERIFY(incubator.isError());
+        auto error = incubator.errors().first();
+        QVERIFY(error.description().contains(QLatin1String("Required property requiredProperty was not initialized")));
+        QVERIFY(incubator.object() == nullptr);
+    }
+}
+
 QTEST_MAIN(tst_qqmlincubator)
 
 #include "tst_qqmlincubator.moc"