Fix crash in QmlMetaProperty that could occur when using value-type

properties after the engine was deleted.

1 files changed, 30 insertions, 0 deletions

diff --git a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
index ec6b87f..5c8178f 100644
--- a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
+++ b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
@@ -122,6 +122,9 @@ private slots:
 
     //writeToReadOnly();
 
+    // Bugs
+    void crashOnValueProperty();
+
 private:
     QmlEngine engine;
 };
@@ -208,6 +211,9 @@ private:
     QUrl m_url;
 };
 
+QML_DECLARE_TYPE(PropertyObject);
+QML_DEFINE_TYPE(Test,1,0,PropertyObject,PropertyObject);
+
 void tst_qmlmetaproperty::qmlmetaproperty_object()
 {
     QObject object; // Has no default property
@@ -1118,6 +1124,30 @@ void tst_qmlmetaproperty::writeObjectToQmlList()
     QCOMPARE(container->qmlChildren()->at(1), object);
 }
 
+void tst_qmlmetaproperty::crashOnValueProperty()
+{
+    QmlEngine *engine = new QmlEngine;
+    QmlComponent component(engine);
+
+    component.setData("import Test 1.0\nPropertyObject { wrectProperty.x: 10 }", QUrl());
+    PropertyObject *obj = qobject_cast<PropertyObject*>(component.create());
+    QVERIFY(obj != 0);
+
+    QmlMetaProperty p = QmlMetaProperty::createProperty(obj, "wrectProperty.x", qmlContext(obj));
+    QCOMPARE(p.name(), QString("wrectProperty.x"));
+
+    QCOMPARE(p.read(), QVariant(10));
+
+    //don't crash once the engine is deleted
+    delete engine;
+    engine = 0;
+
+    QCOMPARE(p.propertyTypeName(), "int");
+    QCOMPARE(p.read(), QVariant(10));
+    p.write(QVariant(20));
+    QCOMPARE(p.read(), QVariant(20));
+}
+
 QTEST_MAIN(tst_qmlmetaproperty)
 
 #include "tst_qmlmetaproperty.moc"