Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into tqtc/lts-5.15-opensourcev5.15.4-lts-lgpl

Change-Id: I39595f8b7ad212c842709b939226d95531819391

1 files changed, 33 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp b/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp
index 549aae8c2b..25adf4f31d 100644
--- a/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp
+++ b/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp
@@ -71,6 +71,7 @@ private slots:
     void contextDelete();
     void garbageCollection();
     void requiredProperties();
+    void deleteInSetInitialState();
 
 private:
     QQmlIncubationController controller;
@@ -1213,6 +1214,38 @@ void tst_qqmlincubator::requiredProperties()
     }
 }
 
+class DeletingIncubator : public QQmlIncubator
+{
+
+
+    // QQmlIncubator interface
+protected:
+    void statusChanged(Status) override
+    {
+
+    }
+    void setInitialState(QObject *obj) override
+    {
+        delete obj;
+        clear();
+    }
+};
+
+void tst_qqmlincubator::deleteInSetInitialState()
+{
+    QQmlComponent component(&engine, testFileUrl("requiredProperty.qml"));
+    QVERIFY(component.isReady());
+    // forceCompletion immediately after creating an asynchronous object completes it
+    DeletingIncubator incubator;
+    incubator.setInitialProperties({{"requiredProperty", 42}});
+    QVERIFY(incubator.isNull());
+    component.create(incubator);
+    QVERIFY(incubator.isLoading());
+    incubator.forceCompletion(); // no crash
+    QVERIFY(incubator.isNull());
+    QCOMPARE(incubator.object(), nullptr); // object was deleted
+}
+
 QTEST_MAIN(tst_qqmlincubator)
 
 #include "tst_qqmlincubator.moc"