Update var property to null on object deletion

When a var property contains a pointer to a QObject-derived instance,
ensure that object deletion causes the property to be updated.

Task-number: QTBUG-26542
Change-Id: I67a59ffd7f09063328d45dc84889add55a5428e4
Reviewed-by: Martin Jones <martin.jones@nokia.com>

1 files changed, 48 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmllanguage/data/objectDeletionNotify.4.qml b/tests/auto/qml/qqmllanguage/data/objectDeletionNotify.4.qml
new file mode 100644
index 0000000000..ccfda01644
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/objectDeletionNotify.4.qml
@@ -0,0 +1,48 @@
+import QtQuick 2.0
+
+Item {
+    property bool success: false
+
+    Component {
+        id: internal
+
+        Item {
+        }
+    }
+
+    property var expectNull: null
+
+    function setExpectNull(b) {
+        success = false;
+        expectNull = b;
+    }
+
+    function setExpectNoChange() {
+        success = true;
+        expectNull = null;
+    }
+
+    property var obj: null
+    onObjChanged: success = (expectNull == null) ? false : (expectNull ? obj == null : obj != null)
+
+    property var temp: null
+
+    Component.onCompleted: {
+        // Set obj to contain an object
+        setExpectNull(false)
+        obj = internal.createObject(null, {})
+        if (!success) return
+
+        // Use temp variable to keep object reference alive
+        temp = obj
+
+        // Change obj to contain a string
+        setExpectNull(false)
+        obj = 'hello'
+    }
+
+    function destroyObject() {
+        setExpectNoChange()
+        temp.destroy();
+    }
+}