Add JavaScript "var" property type to QML

This commit adds a new syntax which allows "var" type properties
which can have JavaScript objects (as well as other basic types)
assigned to them. Such JavaScript objects cannot be bound to.

Task-number: QMLNG-18
Change-Id: If7f5045f4669e0d5c1b8d0891ed765128d0bc1c6
Reviewed-on: http://codereview.qt-project.org/1466
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

33 files changed, 637 insertions, 16 deletions

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent.qml b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent.qml
new file mode 100644
index 0000000000..36c025401f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent.qml
@@ -0,0 +1,23 @@
+import QtQuick 2.0
+import Qt.test 1.0
+
+Item {
+    id: first
+    property var vp: Item {
+        id: second
+        property var vp: Item {
+            id: third
+            property var vp: Item {
+                id: fourth
+                property var vp: Item {
+                    id: fifth
+                    property int fifthCanary: 5
+                    property var circ: third.vp
+                    property MyScarceResourceObject srp;
+                    srp: MyScarceResourceObject { id: scarceResourceProvider }
+                    property variant memoryHog: scarceResourceProvider.newScarceResource()
+                }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent2.qml
new file mode 100644
index 0000000000..6a49cb9317
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent2.qml
@@ -0,0 +1,26 @@
+import QtQuick 2.0
+import Qt.test 1.0
+
+// Similar to PVCC.qml except that it has another var property
+// It will have a different metaobject.
+Item {
+    id: first
+    property var anotherVp: 6
+    property var vp: Item {
+        id: second
+        property var vp: Item {
+            id: third
+            property var vp: Item {
+                id: fourth
+                property var vp: Item {
+                    id: fifth
+                    property int fifthCanary: 5
+                    property var circ: third.vp
+                    property MyScarceResourceObject srp;
+                    srp: MyScarceResourceObject { id: scarceResourceProvider }
+                    property variant memoryHog2: scarceResourceProvider.newScarceResource()
+                }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent3.qml
new file mode 100644
index 0000000000..a90725016e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent3.qml
@@ -0,0 +1,16 @@
+import QtQuick 2.0
+
+Rectangle {
+    id: rectangle      // will have JS ownership
+    objectName: "rectangle"
+    width: 10
+    height: 10
+    property var rectCanary: 5
+
+    Text {
+        id: text // will have Eventual-JS ownership
+        objectName: "text"
+        property var vp: rectangle
+        property var textCanary: 10
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent4.qml
new file mode 100644
index 0000000000..9273a52f54
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent4.qml
@@ -0,0 +1,28 @@
+import QtQuick 2.0
+
+Rectangle {
+    id: rectangle      // will have JS ownership
+    objectName: "rectangle"
+    width: 10
+    height: 10
+    property var rectCanary: 5
+
+    Text {
+        id: text // will have Eventual-JS ownership
+        objectName: "text"
+        property var vp
+        property var textCanary: 10
+
+        // The varProperties array of "text" is weak
+        // (due to eventual JS ownership since parent is JS owned)
+        // but nonetheless, the reference to the created QObject
+        // should cause that QObject to NOT be collected.
+        function constructQObject() {
+            var component = Qt.createComponent("PropertyVarCircularComponent5.qml");
+            if (component.status == Component.Ready) {
+                text.vp = component.createObject(null); // has JavaScript ownership
+            }
+            gc();
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent5.qml
new file mode 100644
index 0000000000..94ef338792
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarCircularComponent5.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.0
+
+Image {
+    id: image
+    objectName: "image"
+    property var imageCanary: 13
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarInheritanceComponent.qml b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarInheritanceComponent.qml
new file mode 100644
index 0000000000..b01cf6ed84
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarInheritanceComponent.qml
@@ -0,0 +1,22 @@
+import QtQuick 2.0
+import Qt.test 1.0
+
+PropertyVarCircularComponent {
+    id: inheritanceComponent
+    property int inheritanceIntProperty: 6
+    property var inheritanceVarProperty
+
+    function constructGarbage() {
+        var retn = 1;
+        var component = Qt.createComponent("PropertyVarCircularComponent2.qml");
+        if (component.status == Component.Ready) {
+            retn = component.createObject(null); // has JavaScript ownership
+        }
+        return retn;
+    }
+
+    Component.onCompleted: {
+        inheritanceVarProperty = constructGarbage();
+        gc();
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarOwnershipComponent.qml b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarOwnershipComponent.qml
new file mode 100644
index 0000000000..c1f73d3bac
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/PropertyVarOwnershipComponent.qml
@@ -0,0 +1,37 @@
+import QtQuick 2.0
+
+Rectangle {
+    id: rectangle      // will have JS ownership
+    objectName: "rectangle"
+    width: 10
+    height: 10
+    property var rectCanary: 5
+
+    Text {
+        id: textOne // will have Eventual-JS ownership
+        objectName: "textOne"
+        property var textCanary: 11
+        property var vp
+    }
+
+    Text {
+        id: textTwo
+        objectName: "textTwo"
+        property var textCanary: 12
+        property var vp
+
+        function constructQObject() {
+            var component = Qt.createComponent("PropertyVarCircularComponent5.qml");
+            if (component.status == Component.Ready) {
+                textTwo.vp = component.createObject(null); // has JavaScript ownership
+            }
+            gc();
+        }
+
+        function deassignVp() {
+            textTwo.textCanary = 22;
+            textTwo.vp = textTwo.textCanary;
+            gc();
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.1.qml
index 9c27653b34..8a06c30d8c 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.1.qml
@@ -18,8 +18,4 @@ Item {
         // NOTE: manually add reference from first to second
         // in unit test prior reparenting and gc.
     }
-
-    function performGc() {
-        gc();
-    }
 }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.2.qml
index dc196263b4..91edc447e2 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.handle.2.qml
@@ -19,8 +19,4 @@ Item {
         // note: must manually reparent in unit test
         // after setting the handle references.
     }
-
-    function performGc() {
-        gc();
-    }
 }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.1.qml
index 4fd1311c29..70e8390677 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.1.qml
@@ -24,8 +24,4 @@ Item {
         first = cro;
         second = cro;
     }
-
-    function performGc() {
-        gc();
-    }
 }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.2.qml
index 3f8415ce0f..2ddb9253eb 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/handleReferenceManagement.object.2.qml
@@ -25,8 +25,4 @@ Item {
         first = cro;
         second = cro;
     }
-
-    function performGc() {
-        gc();
-    }
 }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.1.qml
new file mode 100644
index 0000000000..219e61bf91
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.1.qml
@@ -0,0 +1,22 @@
+import QtQuick 2.0
+
+Item {
+    id: root
+    property bool test: false
+
+    property var car: new vehicle(4);
+    property int wheelCount: car.wheels
+
+    function vehicle(wheels) {
+        this.wheels = wheels;
+    }
+
+    Component.onCompleted: {
+        car.wheels = 6;  // not bindable, wheelCount shouldn't update
+
+        if (car.wheels != 6) return;
+        if (wheelCount != 4) return;
+
+        test = true;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.2.qml
new file mode 100644
index 0000000000..2ac4807ec5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.2.qml
@@ -0,0 +1,24 @@
+import QtQuick 2.0
+
+Item {
+    id: root
+    property bool test: false
+
+    property var truck: new vehicle(8);
+    property int wheelCount: truck.wheels
+
+    function vehicle(wheels) {
+        this.wheels = wheels;
+    }
+
+    Component.onCompleted: {
+        if (wheelCount != 8) return;
+
+        // not bindable, but wheelCount will update because truck itself changed.
+        truck = new vehicle(12); 
+
+        if (wheelCount != 12) return;
+
+        test = true;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.3.qml
new file mode 100644
index 0000000000..cf6a651639
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.3.qml
@@ -0,0 +1,19 @@
+import QtQuick 2.0
+
+Item {
+    id: root
+    property bool test: false
+
+    property var jsint: 4
+    property int bound: jsint + 5
+
+    Component.onCompleted: {
+        if (bound != 9) return;
+
+        jsint = jsint + 1;
+
+        if (bound != 10) return;
+
+        test = true;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.4.qml
new file mode 100644
index 0000000000..82fc225e71
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.4.qml
@@ -0,0 +1,18 @@
+import QtQuick 2.0
+
+Item {
+    property bool test: false
+
+    property var items: [1, 2, 3, "four", "five"]
+    property int bound: items[0]
+
+    Component.onCompleted: {
+        if (bound != 1) return;
+
+        items[0] = 10      // bound should remain 1
+
+        if (bound != 1) return;
+
+        test = true;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.5.qml
new file mode 100644
index 0000000000..a5c7812289
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.5.qml
@@ -0,0 +1,18 @@
+import QtQuick 2.0
+
+Item {
+    property bool test: false
+
+    property var attributes: { 'color': 'red', 'width': 100 }
+    property int bound: attributes.width
+
+    Component.onCompleted: {
+        if (bound != 100) return;
+
+        attributes.width = 200   // bound should remain 100
+
+        if (bound != 100) return;
+
+        test = true;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.6.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.6.qml
new file mode 100644
index 0000000000..5197aeada7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.6.qml
@@ -0,0 +1,18 @@
+import QtQuick 2.0
+
+Item {
+    property bool test: false
+
+    property var items: [1, 2, 3, "four", "five"]
+    property int bound: items[0]
+
+    Component.onCompleted: {
+        if (bound != 1) return false;
+
+        items = [10, 2, 3, "four", "five"]  // bound should now be 10
+
+        if (bound != 10) return false;
+
+        test = true;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.7.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.7.qml
new file mode 100644
index 0000000000..1d6c8c0a37
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.7.qml
@@ -0,0 +1,18 @@
+import QtQuick 2.0
+
+Item {
+    property bool test: false
+
+    property var attributes: { 'color': 'red', 'width': 100 }
+    property int bound: attributes.width
+
+    Component.onCompleted: {
+        if (bound != 100) return;
+
+        attributes = { 'color': 'blue', 'width': 200 }   // bound should now be 200
+
+        if (bound != 200) return;
+
+        test = true;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.8.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.8.qml
new file mode 100644
index 0000000000..a9f73db402
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.8.qml
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+
+Item {
+    property bool test: false
+
+    property var literalValue: 6
+
+    Component.onCompleted: {
+        if (literalValue != 6) return;
+        test = true;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.9.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.9.qml
new file mode 100644
index 0000000000..f5aca28417
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.9.qml
@@ -0,0 +1,19 @@
+import QtQuick 2.0
+import Qt.test 1.0
+
+Item {
+    property bool test: false
+
+    MyQmlObject {
+        id: qmlobject
+        intProperty: 5
+    }
+    property var qobjectVar: qmlobject
+    property int bound: qobjectVar.intProperty
+
+    Component.onCompleted: {
+        if (bound != 5) return;
+
+        test = true;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.circular.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.circular.2.qml
new file mode 100644
index 0000000000..93c44afcc9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.circular.2.qml
@@ -0,0 +1,26 @@
+import QtQuick 2.0
+
+Item {
+    id: root
+    objectName: "separateRootObject"
+    property var vp
+
+    function constructGarbage() {
+        var retn = 1;
+        var component = Qt.createComponent("PropertyVarCircularComponent3.qml");
+        if (component.status == Component.Ready) {
+            retn = component.createObject(null); // has JavaScript ownership
+        }
+        return retn;
+    }
+
+    function assignCircular() {
+        vp = constructGarbage();
+        gc();
+    }
+
+    function deassignCircular() {
+        vp = 2;
+        gc();
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.circular.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.circular.qml
new file mode 100644
index 0000000000..171d7747cd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.circular.qml
@@ -0,0 +1,44 @@
+import QtQuick 2.0
+import Qt.test 1.0
+
+Item {
+    id: testCircular
+
+    property var varProperty
+    property variant canaryResource
+    property int canaryInt
+
+    function constructGarbage() {
+        var retn = 1;
+        var component = Qt.createComponent("PropertyVarCircularComponent.qml");
+        if (component.status == Component.Ready) {
+            retn = component.createObject(null); // has JavaScript ownership
+        }
+        return retn;
+    }
+
+    function deassignCanaryResource() {
+        canaryResource = 1;
+        gc();
+    }
+
+    function assignCircular() {
+        varProperty = constructGarbage();
+        canaryResource = varProperty.vp.vp.vp.vp.memoryHog;
+        canaryInt = varProperty.vp.vp.vp.vp.fifthCanary; // == 5
+        gc();
+    }
+
+    function deassignCircular() {
+        canaryInt = 2;
+        varProperty = 2;
+        gc();
+    }
+
+    function assignThenDeassign() {
+        varProperty = constructGarbage();
+        varProperty = 2;
+        gc();
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.inherit.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.inherit.qml
new file mode 100644
index 0000000000..abd0dd7c04
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.inherit.qml
@@ -0,0 +1,34 @@
+import QtQuick 2.0
+import Qt.test 1.0
+
+Item {
+    id: testInheritance
+
+    property var varProperty
+
+    function constructGarbage() {
+        var retn = 1;
+        var component = Qt.createComponent("PropertyVarInheritanceComponent.qml");
+        if (component.status == Component.Ready) {
+            retn = component.createObject(null); // has JavaScript ownership
+        }
+        return retn;
+    }
+
+    function assignCircular() {
+        varProperty = constructGarbage();
+        gc();
+    }
+
+    function deassignCircular() {
+        varProperty = 2;
+        gc();
+    }
+
+    function assignThenDeassign() {
+        varProperty = constructGarbage();
+        varProperty = 2;
+        gc();
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.reparent.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.reparent.qml
new file mode 100644
index 0000000000..7b3df674f1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVar.reparent.qml
@@ -0,0 +1,27 @@
+import QtQuick 2.0
+
+Item {
+    id: root
+    objectName: "separateRootObject"
+    property var vp
+
+    function constructGarbage() {
+        var retn = 1;
+        var component = Qt.createComponent("PropertyVarOwnershipComponent.qml");
+        if (component.status == Component.Ready) {
+            retn = component.createObject(null); // has JavaScript ownership
+        }
+        return retn;
+    }
+
+    function assignVarProp() {
+        vp = constructGarbage();
+        gc();
+    }
+
+    function deassignVarProp() {
+        vp = 2;
+        gc();
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarCpp.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarCpp.qml
new file mode 100644
index 0000000000..cd3147f565
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarCpp.qml
@@ -0,0 +1,17 @@
+import QtQuick 2.0
+import Qt.test 1.0
+
+Item {
+    id: testOwnership
+    property int intProperty: 10
+    property var varProperty: intProperty
+    property var varProperty2: false
+    property var varBound: varProperty + 5
+    property int intBound: varProperty + 5
+    property var jsobject: new vehicle(4)
+
+    function vehicle(wheels) {
+        this.wheels = wheels;
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarImplicitOwnership.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarImplicitOwnership.qml
new file mode 100644
index 0000000000..9cebded932
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarImplicitOwnership.qml
@@ -0,0 +1,26 @@
+import QtQuick 2.0
+
+Item {
+    id: root
+    objectName: "separateRootObject"
+    property var vp
+
+    function constructGarbage() {
+        var retn = 1;
+        var component = Qt.createComponent("PropertyVarCircularComponent4.qml");
+        if (component.status == Component.Ready) {
+            retn = component.createObject(null); // has JavaScript ownership
+        }
+        return retn;
+    }
+
+    function assignCircular() {
+        vp = constructGarbage();
+        gc();
+    }
+
+    function deassignCircular() {
+        vp = 2;
+        gc();
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.2.qml
new file mode 100644
index 0000000000..14d4f9fd27
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.2.qml
@@ -0,0 +1,24 @@
+import QtQuick 2.0
+import Qt.test 1.0
+
+Item {
+    id: testOwnership
+    property bool test: false
+
+    property int dummyProperty // Tests for non-interference of other properties
+    property var varProperty
+
+    function runTest() {
+        if (varProperty != undefined) return;
+        varProperty = { a: 10, b: 11 }
+        if (varProperty.a != 10) return;
+
+        gc(); // Shouldn't collect
+
+        if (varProperty.a != 10) return;
+
+        test = true;
+    } 
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.3.qml
new file mode 100644
index 0000000000..d5b449c938
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.3.qml
@@ -0,0 +1,31 @@
+import QtQuick 2.0
+
+Item {
+    property var object
+
+    property bool test1: false
+    property bool test2: false
+
+    // Test methods are executed in sequential order
+
+    function runTest() {
+        var c = Qt.createComponent("propertyVarOwnership.3.type.qml");
+        object = c.createObject();
+
+        if (object.dummy != 10) return;
+        test1 = true;
+    }
+
+    // Run gc() from C++ 
+
+    function runTest2() {
+        if (object.dummy != 10) return;
+
+        object = undefined;
+        if (object != undefined) return;
+
+        test2 = true;
+    }
+
+    // Run gc() from C++ - QObject should be collected
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.3.type.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.3.type.qml
new file mode 100644
index 0000000000..3406553b91
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.3.type.qml
@@ -0,0 +1,5 @@
+import QtQuick 2.0
+
+QtObject {
+    property int dummy: 10
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.qml
new file mode 100644
index 0000000000..1eba36ce81
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.qml
@@ -0,0 +1,25 @@
+import QtQuick 2.0
+
+Item {
+    id: root
+
+    property var object
+
+    property bool test: false
+
+    Component.onCompleted: {
+        var c = Qt.createComponent("propertyVarOwnership.4.type1.qml");
+        object = c.createObject();
+
+        if (object.dummy != 10) return;
+        if (object.test != true) return;
+
+        object.creatorRef = root;
+
+        test = true;
+    }
+
+    function runTest() {
+        object = null;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.type1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.type1.qml
new file mode 100644
index 0000000000..9a29b6e17f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.type1.qml
@@ -0,0 +1,23 @@
+import QtQuick 2.0
+
+// Has a self reference in selfRef, and a reference to propertyVarOwnership.4.qml in creatorRef
+Item {
+    id: root
+
+    property var creatorRef
+    property var selfRef
+    property var object
+
+    property int dummy: 10
+    property bool test: false
+
+    Component.onCompleted: {
+        selfRef = root;
+
+        var c = Qt.createComponent("propertyVarOwnership.4.type2.qml");
+        object = c.createObject();
+        object.creatorRef = root;
+
+        test = true;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.type2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.type2.qml
new file mode 100644
index 0000000000..f82b8a1c1e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.4.type2.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.0
+
+// Has a reference to propertyVarOwnership.4.type1.qml in creatorRef
+Item {
+    property var creatorRef
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.qml
new file mode 100644
index 0000000000..7b99c4b6ad
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyVarOwnership.qml
@@ -0,0 +1,22 @@
+import QtQuick 2.0
+import Qt.test 1.0
+
+Item {
+    id: testOwnership
+    property bool test: false
+
+    property var varProperty
+
+    function runTest() {
+        if (varProperty != undefined) return;
+        varProperty = { a: 10, b: 11 }
+        if (varProperty.a != 10) return;
+
+        gc(); // Shouldn't collect
+
+        if (varProperty.a != 10) return;
+
+        test = true;
+    } 
+}
+