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

Change-Id: I0127f2c16de1d930bdd8cbccd42ec6785f31ab96

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp b/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
index 0263115db8..efd5bb571b 100644
--- a/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
+++ b/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
@@ -118,6 +118,7 @@ private slots:
     void recursionContinuation();
     void partialComponentCreation();
     void callingContextForInitialProperties();
+    void setNonExistentInitialProperty();
     void relativeUrl_data();
     void relativeUrl();
 
@@ -607,6 +608,23 @@ void tst_qqmlcomponent::callingContextForInitialProperties()
     QVERIFY(checker->scopeObject->metaObject()->indexOfProperty("incubatedObject") != -1);
 }
 
+void tst_qqmlcomponent::setNonExistentInitialProperty()
+{
+    QQmlIncubationController controller;
+    QQmlEngine engine;
+    engine.setIncubationController(&controller);
+    QQmlComponent component(&engine, testFileUrl("nonExistentInitialProperty.qml"));
+    QScopedPointer<QObject> obj(component.create());
+    QVERIFY(!obj.isNull());
+    QMetaObject::invokeMethod(obj.data(), "startIncubation");
+    QJSValue incubatorStatus = obj->property("incubator").value<QJSValue>();
+    incubatorStatus.property("forceCompletion").callWithInstance(incubatorStatus);
+    QJSValue objectWrapper = incubatorStatus.property("object");
+    QVERIFY(objectWrapper.isQObject());
+    QPointer<QObject> object(objectWrapper.toQObject());
+    QVERIFY(object->property("ok").toBool());
+}
+
 void tst_qqmlcomponent::relativeUrl_data()
 {
     QTest::addColumn<QUrl>("url");