Merge remote-tracking branch 'origin/dev' into wip/cmake

Removed dependencies.yaml because we don't use it yet in wip/cmake.
Fixed conflict in qmlcachegen.cpp.

Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922

2 files changed, 44 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlincubator/data/requiredProperty.qml b/tests/auto/qml/qqmlincubator/data/requiredProperty.qml
new file mode 100644
index 0000000000..9e355dce72
--- /dev/null
+++ b/tests/auto/qml/qqmlincubator/data/requiredProperty.qml
@@ -0,0 +1,5 @@
+import QtQuick 2.12
+
+Item {
+    required property int requiredProperty
+}
diff --git a/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp b/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp
index 8e25079703..756b3b1d7c 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;
@@ -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"