Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

67 files changed, 202 insertions, 146 deletions

diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
index be20ba1..ae62363 100644
--- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
+++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
@@ -228,7 +228,7 @@ private:
 #define TEST_CONTEXT_PROPERTY(ctxt, name, value) \
 { \
     QDeclarativeComponent component(&engine); \
-    component.setData("import Qt 4.6; QtObject { property var test: " #name " }", QUrl()); \
+    component.setData("import Qt 4.6; QtObject { property variant test: " #name " }", QUrl()); \
 \
     QObject *obj = component.create(ctxt); \
 \
@@ -278,7 +278,7 @@ void tst_qdeclarativecontext::setContextProperty()
     // Changes in context properties
     {
         QDeclarativeComponent component(&engine); 
-        component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); 
+        component.setData("import Qt 4.6; QtObject { property variant test: a }", QUrl()); 
 
         QObject *obj = component.create(&ctxt2); 
 
@@ -290,7 +290,7 @@ void tst_qdeclarativecontext::setContextProperty()
     }
     {
         QDeclarativeComponent component(&engine); 
-        component.setData("import Qt 4.6; QtObject { property var test: b }", QUrl()); 
+        component.setData("import Qt 4.6; QtObject { property variant test: b }", QUrl()); 
 
         QObject *obj = component.create(&ctxt2); 
 
@@ -304,7 +304,7 @@ void tst_qdeclarativecontext::setContextProperty()
     }
     {
         QDeclarativeComponent component(&engine); 
-        component.setData("import Qt 4.6; QtObject { property var test: e.a }", QUrl()); 
+        component.setData("import Qt 4.6; QtObject { property variant test: e.a }", QUrl()); 
 
         QObject *obj = component.create(&ctxt2); 
 
@@ -318,7 +318,7 @@ void tst_qdeclarativecontext::setContextProperty()
     // New context properties
     {
         QDeclarativeComponent component(&engine); 
-        component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); 
+        component.setData("import Qt 4.6; QtObject { property variant test: a }", QUrl()); 
 
         QObject *obj = component.create(&ctxt2); 
 
@@ -332,7 +332,7 @@ void tst_qdeclarativecontext::setContextProperty()
     // Setting an object-variant context property
     {
         QDeclarativeComponent component(&engine);
-        component.setData("import Qt 4.6; QtObject { id: root; property int a: 10; property int test: ctxtProp.a; property var obj: root; }", QUrl());
+        component.setData("import Qt 4.6; QtObject { id: root; property int a: 10; property int test: ctxtProp.a; property variant obj: root; }", QUrl());
 
         QDeclarativeContext ctxt(engine.rootContext());
         ctxt.setContextProperty("ctxtProp", QVariant());
@@ -380,7 +380,7 @@ void tst_qdeclarativecontext::setContextObject()
     // Changes in context properties
     {
         QDeclarativeComponent component(&engine); 
-        component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); 
+        component.setData("import Qt 4.6; QtObject { property variant test: a }", QUrl()); 
 
         QObject *obj = component.create(&ctxt); 
 
@@ -412,7 +412,7 @@ void tst_qdeclarativecontext::destruction()
 void tst_qdeclarativecontext::idAsContextProperty()
 {
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.6; QtObject { property var a; a: QtObject { id: myObject } }", QUrl());
+    component.setData("import Qt 4.6; QtObject { property variant a; a: QtObject { id: myObject } }", QUrl());
 
     QObject *obj = component.create();
     QVERIFY(obj);
diff --git a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
index 1cbe2ac..d391941 100644
--- a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
+++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
@@ -450,7 +450,7 @@ void tst_qdeclarativedom::loadDynamicProperty()
                          "    property url f\n"
                          "    property color g\n"
                          "    property date h\n"
-                         "    property var i\n"
+                         "    property variant i\n"
                          "    property QtObject j\n"
                          "}";
 
@@ -483,8 +483,8 @@ void tst_qdeclarativedom::loadDynamicProperty()
         DP_TEST(5, f, QVariant::Url, 128, 14, "url");
         DP_TEST(6, g, QVariant::Color, 147, 16, "color");
         DP_TEST(7, h, QVariant::DateTime, 168, 15, "date");
-        DP_TEST(8, i, qMetaTypeId<QVariant>(), 188, 14, "var");
-        DP_TEST(9, j, -1, 207, 19, "QtObject");
+        DP_TEST(8, i, qMetaTypeId<QVariant>(), 188, 18, "variant");
+        DP_TEST(9, j, -1, 211, 19, "QtObject");
     }
 
     {
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml
index 7c32e56..28252df 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml
@@ -3,7 +3,7 @@ import Qt 4.6
 QtObject {
     property int b: obj.prop.a
 
-    property var prop;
+    property variant prop;
     prop: QtObject {
         property int a: 10
     }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml b/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml
index 2fec9da..1c88700 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml
@@ -38,7 +38,7 @@ QtObject {
     property int d: 176
     property string e: "Hello"
     property string f: "World"
-    property var g: 6.7
-    property var h: "!"
-    property var i: true
+    property variant g: 6.7
+    property variant h: "!"
+    property variant i: true
 }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
index 6bc3a17..29eba42 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 import Qt.test 1.0
 
 QtObject {
-    property var obj
+    property variant obj
     obj: MyQmlObject {
         id: myObject
         value: 92
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml
index 2db0fc6..93054f8 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml
@@ -4,7 +4,7 @@ import Qt 4.6
 MyQmlObject {
     objectProperty: if(1) otherObject
 
-    property var obj
+    property variant obj
 
     obj: QtObject {
         id: otherObject
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml
index f66428d..5ae8b14 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml
@@ -4,7 +4,7 @@ import Qt 4.6
 MyQmlObject {
     objectProperty: otherObject
 
-    property var obj
+    property variant obj
 
     obj: QtObject {
         id: otherObject
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml
index 47f4e50..e6d31c7 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml
@@ -1,5 +1,5 @@
 import Qt 4.6
 
 QtObject {
-    property var test: children
+    property variant test: children
 }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml b/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml
index 18e488a..edcd340 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml
@@ -3,7 +3,7 @@ import Qt 4.6
 Item {
     id: root
 
-    property var item: child
+    property variant item: child
     Item { id: child }
 
     property bool test1: child == child
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/propertyAssignmentErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/propertyAssignmentErrors.qml
index 483179a..c66f071 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/propertyAssignmentErrors.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/propertyAssignmentErrors.qml
@@ -4,7 +4,7 @@ QtObject {
     id: root
 
     property int a
-    property var b
+    property variant b
 
     Component.onCompleted: {
         try {
@@ -14,12 +14,6 @@ QtObject {
         }
 
         try {
-            root.b = [ 10, root ]
-        } catch(e) {
-            console.log (e.fileName + ":" + e.lineNumber + ":" + e);
-        }
-
-        try {
             root.a = "Hello";
         } catch(e) {
             console.log (e.fileName + ":" + e.lineNumber + ":" + e);
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalParameterTypes.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalParameterTypes.qml
index 6fc8b02..ffbe317 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/signalParameterTypes.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/signalParameterTypes.qml
@@ -6,9 +6,9 @@ MyQmlObject
     property int intProperty
     property real realProperty
     property color colorProperty
-    property var variantProperty
+    property variant variantProperty
 
-    signal mySignal(int a, real b, color c, var d)
+    signal mySignal(int a, real b, color c, variant d)
 
     onMySignal: { intProperty = a; realProperty = b; colorProperty = c; variantProperty = d; }
 
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml
index fa7e01c..bd23544 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
 
 QtObject {
-    property var obj: nested
+    property variant obj: nested
 
-    property var obj2
+    property variant obj2
     obj2: NestedTypeTransientErrors {
         id: nested
     }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 72f14f9..c6bb276 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -1026,12 +1026,10 @@ void tst_qdeclarativeecmascript::propertyAssignmentErrors()
     QString url = component.url().toString();
 
     QString warning1 = url + ":11:Error: Cannot assign [undefined] to int";
-    QString warning2 = url + ":17:Error: Cannot assign JavaScript array to QML variant property";
-    QString warning3 = url + ":23:Error: Cannot assign QString to int";
+    QString warning2 = url + ":17:Error: Cannot assign QString to int";
 
     QTest::ignoreMessage(QtDebugMsg, warning1.toLatin1().constData());
     QTest::ignoreMessage(QtDebugMsg, warning2.toLatin1().constData());
-    QTest::ignoreMessage(QtDebugMsg, warning3.toLatin1().constData());
 
     QObject *object = component.create();
     QVERIFY(object != 0);
diff --git a/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml
index ba6b807..a061ae2 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml
@@ -3,7 +3,7 @@ import Qt 4.6
 Rectangle {
     id: root
     property int added: -1
-    property var removed
+    property variant removed
 
     width: 240
     height: 320
diff --git a/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml
index cd5b426..548e498 100644
--- a/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml
+++ b/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 QtObject {
-    property var nested
+    property variant nested
 
     nested:  QtObject {}
 }
diff --git a/tests/auto/declarative/qdeclarativeinfo/data/nestedQmlObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/nestedQmlObject.qml
index a2ce78a..eac0b73 100644
--- a/tests/auto/declarative/qdeclarativeinfo/data/nestedQmlObject.qml
+++ b/tests/auto/declarative/qdeclarativeinfo/data/nestedQmlObject.qml
@@ -1,8 +1,8 @@
 import Qt 4.6
 
 QtObject {
-    property var nested
+    property variant nested
     nested: NestedObject { }
-    property var nested2: nested.nested
+    property variant nested2: nested.nested
 }
 
diff --git a/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml
index ce05f89..176636a 100644
--- a/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml
+++ b/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 QtObject {
-    property var nested
+    property variant nested
 
     nested: QtObject {
     }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml
index 6362b2d..f62c860 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml
@@ -2,7 +2,7 @@ import Test 1.0
 import Qt 4.6
 
 QtObject {
-    property var other
+    property variant other
     other: MyTypeObject { id: obj }
     property alias enumAlias: obj.enumProperty;
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml
index d1e78f8..9050c3a 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml
@@ -3,7 +3,7 @@ import Qt 4.6
 
 QtObject {
     property alias obj : otherObj
-    property var child
+    property variant child
     child: QtObject {
         id: otherObj
         property int myValue: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml b/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
index dc3b382..df8c851 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
@@ -2,7 +2,7 @@ import Test 1.0
 import Qt 4.6
 
 QtObject {
-    property var child
+    property variant child
     child: QtObject { id: obj }
     property alias objAlias: obj;
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml
index e059937..0b968c2 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 QtObject {
-   property var other
+   property variant other
    other: Alias { id: myAliasObject }
 
    property alias value: myAliasObject.aliasValue
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
index 4316d0d..125c518 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
@@ -4,7 +4,7 @@ import Test 1.0
 QtObject {
     property alias otherAlias: otherObject
 
-    property var other 
+    property variant other 
     other: MyQmlObject {
         id: otherObject
         value: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml
index 2b9ad85..629dd2a 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 QtObject {
-   property var other
+   property variant other
    other: Alias3 { id: myAliasObject }
 
    property int value: myAliasObject.obj.myValue
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml
index a2a41a1..7c072e1 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 QtObject {
-   property var other
+   property variant other
    other: Alias4 { id: myAliasObject }
 
    property int value: myAliasObject.obj.myValue
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml
index a1d33ef..91fd833 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml
@@ -1,14 +1,14 @@
 import Qt 4.6
 
 QtObject {
-    property var test1: 1
-    property var test2: 1.7
-    property var test3: "Hello world!"
-    property var test4: "#FF008800"
-    property var test5: "10,10,10x10"
-    property var test6: "10,10"
-    property var test7: "10x10"
-    property var test8: "100,100,100"
-    property var test9: String("#FF008800")
+    property variant test1: 1
+    property variant test2: 1.7
+    property variant test3: "Hello world!"
+    property variant test4: "#FF008800"
+    property variant test5: "10,10,10x10"
+    property variant test6: "10,10"
+    property variant test7: "10x10"
+    property variant test8: "100,100,100"
+    property variant test9: String("#FF008800")
 }
 
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml
index 0ff9370..774762a 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml
@@ -2,6 +2,6 @@ import Test 1.0
 import Qt 4.6
 
 QtObject {
-    property var a;
+    property variant a;
     a: MyQmlObject {}
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml b/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml
index 0a7249a..e745e91 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 QtObject {
-    property var test
+    property variant test
 
     test: ComponentComposite {}
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
index bedab8c..6411609 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
@@ -9,5 +9,5 @@ QtObject {
     property color colorProperty: "red"
     property url urlProperty: "main.qml"
     property date dateProperty: "1945-09-02"
-    property var varProperty: "Hello World!"
+    property variant varProperty: "Hello World!"
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml
index 90c1483..bf048ea 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml
@@ -1,6 +1,6 @@
 import Test 1.0
 MyContainer {
-    property var object : myObjectId
+    property variant object : myObjectId
 
     MyTypeObject {
         id: "myObjectId"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
index 1167e39..9012aa6 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
@@ -1,6 +1,6 @@
 import Qt 4.6 
 
 QtObject {
-    property var o;
+    property variant o;
     o.blah: 10
 }
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml
index cd86a48..a4a976e 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml
@@ -2,7 +2,7 @@ import Test 1.0
 import Qt 4.6
 
 QtObject {
-    property var child
+    property variant child
     child: HelperAlias { objAlias: QtObject {} }
 }
 
diff --git a/tests/auto/declarative/qdeclarativelayouts/data/layouts.qml b/tests/auto/declarative/qdeclarativelayouts/data/layouts.qml
index 1792500..5c2178f 100644
--- a/tests/auto/declarative/qdeclarativelayouts/data/layouts.qml
+++ b/tests/auto/declarative/qdeclarativelayouts/data/layouts.qml
@@ -5,29 +5,26 @@ Item {
     id: resizable
     width:300
     height:300
-
-    GraphicsObjectContainer {
-        anchors.fill: parent
-        synchronizedResizing: true
-
-        QGraphicsWidget {
-
-            layout: QGraphicsLinearLayout {
-                spacing: 0
-                LayoutItem {
-                    objectName: "left"
-                    minimumSize: "100x100"
-                    maximumSize: "300x300"
-                    preferredSize: "100x100"
-                    Rectangle { objectName: "yellowRect"; color: "yellow"; anchors.fill: parent }
-                }
-                LayoutItem {
-                    objectName: "right"
-                    minimumSize: "100x100"
-                    maximumSize: "400x400"
-                    preferredSize: "200x200"
-                    Rectangle { objectName: "greenRect"; color: "green"; anchors.fill: parent }
-                }
+    QGraphicsWidget {
+        x : resizable.x
+        y : resizable.y
+        width : resizable.width
+        height : resizable.height
+        layout: QGraphicsLinearLayout {
+            spacing: 0
+            LayoutItem {
+                objectName: "left"
+                minimumSize: "100x100"
+                maximumSize: "300x300"
+                preferredSize: "100x100"
+                Rectangle { objectName: "yellowRect"; color: "yellow"; anchors.fill: parent }
+            }
+            LayoutItem {
+                objectName: "right"
+                minimumSize: "100x100"
+                maximumSize: "400x400"
+                preferredSize: "200x200"
+                Rectangle { objectName: "greenRect"; color: "green"; anchors.fill: parent }
             }
         }
     }
diff --git a/tests/auto/declarative/qdeclarativelistmodel/data/model.qml b/tests/auto/declarative/qdeclarativelistmodel/data/model.qml
index ebd4ebf..4019948 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/data/model.qml
+++ b/tests/auto/declarative/qdeclarativelistmodel/data/model.qml
@@ -2,9 +2,9 @@ import Qt 4.6
 
 Item {
     id: item
-    property var model
+    property variant model
     property bool done: false
-    property var result
+    property variant result
 
     function evalExpressionViaWorker(commands) {
         done = false
diff --git a/tests/auto/declarative/qdeclarativelistreference/data/variantToList.qml b/tests/auto/declarative/qdeclarativelistreference/data/variantToList.qml
index 0c2d0aa..d64be0f 100644
--- a/tests/auto/declarative/qdeclarativelistreference/data/variantToList.qml
+++ b/tests/auto/declarative/qdeclarativelistreference/data/variantToList.qml
@@ -4,7 +4,7 @@ QtObject {
     property list<QtObject> myList;
     myList: QtObject {}
 
-    property var value: myList
+    property variant value: myList
     property int test: value.length
 }
 
diff --git a/tests/auto/declarative/qdeclarativeqt/data/darker.qml b/tests/auto/declarative/qdeclarativeqt/data/darker.qml
index 2df067e..b265a0e 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/darker.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/darker.qml
@@ -1,11 +1,11 @@
 import Qt 4.6
 
 QtObject {
-    property var test1: Qt.darker(Qt.rgba(1, 0.8, 0.3))
-    property var test2: Qt.darker()
-    property var test3: Qt.darker(Qt.rgba(1, 0.8, 0.3), 10)
-    property var test4: Qt.darker("red");
-    property var test5: Qt.darker("perfectred"); // Non-existant color
-    property var test6: Qt.darker(10);
+    property variant test1: Qt.darker(Qt.rgba(1, 0.8, 0.3))
+    property variant test2: Qt.darker()
+    property variant test3: Qt.darker(Qt.rgba(1, 0.8, 0.3), 10)
+    property variant test4: Qt.darker("red");
+    property variant test5: Qt.darker("perfectred"); // Non-existant color
+    property variant test6: Qt.darker(10);
 }
 
diff --git a/tests/auto/declarative/qdeclarativeqt/data/formatting.qml b/tests/auto/declarative/qdeclarativeqt/data/formatting.qml
index e62749a..4cf0602 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/formatting.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/formatting.qml
@@ -6,13 +6,13 @@ QtObject {
     property string test2: Qt.formatDate(date1, Qt.DefaultLocaleLongDate)
     property string test3: Qt.formatDate(date1, "ddd MMMM d yy")
 
-    property var time1: new Date(0,0,0,14,15,38,200)
+    property variant time1: new Date(0,0,0,14,15,38,200)
     property string test4: Qt.formatTime(time1)
     property string test5: Qt.formatTime(time1, Qt.DefaultLocaleLongDate)
     property string test6: Qt.formatTime(time1, "H:m:s a")
     property string test7: Qt.formatTime(time1, "hh:mm:ss.zzz")
 
-    property var dateTime1: new Date(1978,2,4,9,13,54)
+    property variant dateTime1: new Date(1978,2,4,9,13,54)
     property string test8: Qt.formatDateTime(dateTime1)
     property string test9: Qt.formatDateTime(dateTime1, Qt.DefaultLocaleLongDate)
     property string test10: Qt.formatDateTime(dateTime1, "M/d/yy H:m:s a")
diff --git a/tests/auto/declarative/qdeclarativeqt/data/lighter.qml b/tests/auto/declarative/qdeclarativeqt/data/lighter.qml
index 4e0c431..2d2b835 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/lighter.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/lighter.qml
@@ -1,10 +1,10 @@
 import Qt 4.6
 
 QtObject {
-    property var test1: Qt.lighter(Qt.rgba(1, 0.8, 0.3))
-    property var test2: Qt.lighter()
-    property var test3: Qt.lighter(Qt.rgba(1, 0.8, 0.3), 10)
-    property var test4: Qt.lighter("red");
-    property var test5: Qt.lighter("perfectred"); // Non-existant color
-    property var test6: Qt.lighter(10);
+    property variant test1: Qt.lighter(Qt.rgba(1, 0.8, 0.3))
+    property variant test2: Qt.lighter()
+    property variant test3: Qt.lighter(Qt.rgba(1, 0.8, 0.3), 10)
+    property variant test4: Qt.lighter("red");
+    property variant test5: Qt.lighter("perfectred"); // Non-existant color
+    property variant test6: Qt.lighter(10);
 }
diff --git a/tests/auto/declarative/qdeclarativeqt/data/point.qml b/tests/auto/declarative/qdeclarativeqt/data/point.qml
index c383beb..1054ac9 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/point.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/point.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
 
 QtObject {
-    property var test1: Qt.point(19, 34);
-    property var test2: Qt.point(-3, 109.2);
-    property var test3: Qt.point(-3);
-    property var test4: Qt.point(-3, 109.2, 1);
+    property variant test1: Qt.point(19, 34);
+    property variant test2: Qt.point(-3, 109.2);
+    property variant test3: Qt.point(-3);
+    property variant test4: Qt.point(-3, 109.2, 1);
 }
 
diff --git a/tests/auto/declarative/qdeclarativeqt/data/rect.qml b/tests/auto/declarative/qdeclarativeqt/data/rect.qml
index 82b6428..e008656 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/rect.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/rect.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
 
 QtObject {
-    property var test1: Qt.rect(10, 13, 100, 109)
-    property var test2: Qt.rect(-10, 13, 100, 109.6)
-    property var test3: Qt.rect(10, 13);
-    property var test4: Qt.rect(10, 13, 100, 109, 10)
-    property var test5: Qt.rect(10, 13, 100, -109)
+    property variant test1: Qt.rect(10, 13, 100, 109)
+    property variant test2: Qt.rect(-10, 13, 100, 109.6)
+    property variant test3: Qt.rect(10, 13);
+    property variant test4: Qt.rect(10, 13, 100, 109, 10)
+    property variant test5: Qt.rect(10, 13, 100, -109)
 }
diff --git a/tests/auto/declarative/qdeclarativeqt/data/size.qml b/tests/auto/declarative/qdeclarativeqt/data/size.qml
index 05b0317..93577f2 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/size.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/size.qml
@@ -1,11 +1,11 @@
 import Qt 4.6
 
 QtObject {
-    property var test1: Qt.size(19, 34);
-    property var test2: Qt.size(3, 109.2);
-    property var test3: Qt.size(-3, 10);
-    property var test4: Qt.size(3);
-    property var test5: Qt.size(3, 109.2, 1);
+    property variant test1: Qt.size(19, 34);
+    property variant test2: Qt.size(3, 109.2);
+    property variant test3: Qt.size(-3, 10);
+    property variant test4: Qt.size(3);
+    property variant test5: Qt.size(3, 109.2, 1);
 }
 
 
diff --git a/tests/auto/declarative/qdeclarativeqt/data/vector.qml b/tests/auto/declarative/qdeclarativeqt/data/vector.qml
index a471c7a..16716db 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/vector.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/vector.qml
@@ -1,8 +1,8 @@
 import Qt 4.6
 
 QtObject {
-    property var test1: Qt.vector3d(1, 0, 0.9);
-    property var test2: Qt.vector3d(102, -10, -982.1);
-    property var test3: Qt.vector3d(102, -10);
-    property var test4: Qt.vector3d(102, -10, -982.1, 10);
+    property variant test1: Qt.vector3d(1, 0, 0.9);
+    property variant test2: Qt.vector3d(102, -10, -982.1);
+    property variant test3: Qt.vector3d(102, -10);
+    property variant test4: Qt.vector3d(102, -10, -982.1, 10);
 }
diff --git a/tests/auto/declarative/qdeclarativestates/data/Implementation/MyType.qml b/tests/auto/declarative/qdeclarativestates/data/Implementation/MyType.qml
new file mode 100644
index 0000000..1872de8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/Implementation/MyType.qml
@@ -0,0 +1,32 @@
+import Qt 4.7
+
+Item {
+    Column {
+        anchors.centerIn: parent
+        Image { id: image1; objectName: "image1" }
+        Image { id: image2; objectName: "image2" }
+        Image { id: image3; objectName: "image3" }
+    }
+
+    states: State {
+        name: "SetImageState"
+        PropertyChanges {
+            target: image1
+            source: "images/qt-logo.png"
+        }
+        PropertyChanges {
+            target: image2
+            source: "images/" + "qt-logo.png"
+        }
+        PropertyChanges {
+            target: image3
+            source: "images/" + (true ? "qt-logo.png" : "")
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: parent.state = "SetImageState"
+    }
+
+}
diff --git a/tests/auto/declarative/qdeclarativestates/data/Implementation/images/qt-logo.png b/tests/auto/declarative/qdeclarativestates/data/Implementation/images/qt-logo.png
new file mode 100644
index 0000000..14ddf2a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/Implementation/images/qt-logo.png
diff --git a/tests/auto/declarative/qdeclarativestates/data/urlResolution.qml b/tests/auto/declarative/qdeclarativestates/data/urlResolution.qml
new file mode 100644
index 0000000..8995b56
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/urlResolution.qml
@@ -0,0 +1,12 @@
+import Qt 4.7
+import "Implementation"
+
+Rectangle {
+    width: 100
+    height: 200
+
+    MyType {
+        objectName: "MyType"
+        anchors.fill: parent
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index f0b6759..578bcb4 100644
--- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -43,6 +43,7 @@
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <private/qdeclarativeanchors_p_p.h>
 #include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativeimage_p.h>
 #include <private/qdeclarativetext_p.h>
 #include <private/qdeclarativepropertychanges_p.h>
 #include <private/qdeclarativestategroup_p.h>
@@ -109,6 +110,7 @@ private slots:
     void reset();
     void illegalObjectCreation();
     void whenOrdering();
+    void urlResolution();
 };
 
 void tst_qdeclarativestates::initTestCase()
@@ -1016,6 +1018,27 @@ void tst_qdeclarativestates::whenOrdering()
     QCOMPARE(rect->state(), QLatin1String(""));
 }
 
+void tst_qdeclarativestates::urlResolution()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent c(&engine, SRCDIR "/data/urlResolution.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect != 0);
+
+    QDeclarativeItem *myType = rect->findChild<QDeclarativeItem*>("MyType");
+    QDeclarativeImage *image1 = rect->findChild<QDeclarativeImage*>("image1");
+    QDeclarativeImage *image2 = rect->findChild<QDeclarativeImage*>("image2");
+    QDeclarativeImage *image3 = rect->findChild<QDeclarativeImage*>("image3");
+    QVERIFY(myType != 0 && image1 != 0 && image2 != 0 && image3 != 0);
+
+    myType->setState("SetImageState");
+    QUrl resolved = QUrl::fromLocalFile(SRCDIR "/data/Implementation/images/qt-logo.png");
+    QCOMPARE(image1->source(), resolved);
+    QCOMPARE(image2->source(), resolved);
+    QCOMPARE(image3->source(), resolved);
+}
+
 QTEST_MAIN(tst_qdeclarativestates)
 
 #include "tst_qdeclarativestates.moc"
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml b/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml
index 8d7dbbc..1aed8d8 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 Rectangle {
-    property var myInput: input
+    property variant myInput: input
 
     width: 800; height: 600; color: "blue"
 
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/readOnly.qml b/tests/auto/declarative/qdeclarativetextedit/data/readOnly.qml
index 103a627..69a6479 100644
--- a/tests/auto/declarative/qdeclarativetextedit/data/readOnly.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/readOnly.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 Rectangle {
-    property var myInput: input
+    property variant myInput: input
 
     width: 800; height: 600; color: "blue"
 
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml b/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml
index 493db5b..04f06da 100644
--- a/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 Rectangle {
-    property var myInput: input
+    property variant myInput: input
 
     width: 800; height: 600; color: "blue"
 
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml b/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml
index c47371a..41e8b59 100644
--- a/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 Rectangle {
-    property var myInput: input
+    property variant myInput: input
 
     width: 800; height: 600; color: "blue"
 
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/validators.qml b/tests/auto/declarative/qdeclarativetextinput/data/validators.qml
index 531a232..4b1ba27 100644
--- a/tests/auto/declarative/qdeclarativetextinput/data/validators.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/validators.qml
@@ -1,9 +1,9 @@
 import Qt 4.7
 
 Item {
-    property var intInput: intInput
-    property var dblInput: dblInput
-    property var strInput: strInput
+    property variant intInput: intInput
+    property variant dblInput: dblInput
+    property variant strInput: strInput
 
     width: 800; height: 600;
 
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.3.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.3.qml
index c82b533..d431b4a 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.3.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.3.qml
@@ -1,7 +1,7 @@
 import Test 1.0
 
 MyTypeObject {
-    property var value
+    property variant value
 
     rect: value
 
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/bindingVariantCopy.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingVariantCopy.qml
index 691a56c..3a48c8b 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/bindingVariantCopy.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingVariantCopy.qml
@@ -1,7 +1,7 @@
 import Test 1.0
 
 MyTypeObject {
-    property var object
+    property variant object
     object: MyTypeObject {
         rect.x: 19
         rect.y: 33
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.qml
index 785c250..7c22775 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.qml
@@ -3,7 +3,7 @@ import Qt 4.6
 import "deletedObject.js" as JS
 
 MyTypeObject {
-    property var object
+    property variant object
 
     object: MyTypeObject {}
     Component.onCompleted: JS.startup()
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/font_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/font_read.qml
index e1d1ce0..d73bb13 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/font_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/font_read.qml
@@ -13,6 +13,6 @@ MyTypeObject {
     property int f_capitalization: font.capitalization
     property real f_letterSpacing: font.letterSpacing
     property real f_wordSpacing: font.wordSpacing;
-    property var copy: font
+    property variant copy: font
 }
 
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/point_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/point_read.qml
index 3e67de6..4bb6c53 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/point_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/point_read.qml
@@ -3,5 +3,5 @@ import Test 1.0
 MyTypeObject {
     property int p_x: point.x
     property int p_y: point.y
-    property var copy: point
+    property variant copy: point
 }
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/pointf_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/pointf_read.qml
index d845a5b..0eab6da 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/pointf_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/pointf_read.qml
@@ -3,6 +3,6 @@ import Test 1.0
 MyTypeObject {
     property real p_x: pointf.x
     property real p_y: pointf.y
-    property var copy: pointf
+    property variant copy: pointf
 }
 
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/rect_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/rect_read.qml
index 5364431..c3b37a7 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/rect_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/rect_read.qml
@@ -5,6 +5,6 @@ MyTypeObject {
     property int r_y: rect.y
     property int r_width: rect.width
     property int r_height: rect.height
-    property var copy: rect
+    property variant copy: rect
 }
 
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/rectf_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/rectf_read.qml
index aeb9f41..6ff3ce3 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/rectf_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/rectf_read.qml
@@ -5,6 +5,6 @@ MyTypeObject {
     property real r_y: rectf.y
     property real r_width: rectf.width
     property real r_height: rectf.height
-    property var copy: rectf
+    property variant copy: rectf
 }
 
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/scriptVariantCopy.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/scriptVariantCopy.qml
index 29157e8..42fccfa 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/scriptVariantCopy.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/scriptVariantCopy.qml
@@ -1,7 +1,7 @@
 import Test 1.0
 
 MyTypeObject {
-    property var object
+    property variant object
     object: MyTypeObject {
         rect.x: 19
         rect.y: 33
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/size_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/size_read.qml
index 86dba03..a49fd9f 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/size_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/size_read.qml
@@ -3,6 +3,6 @@ import Test 1.0
 MyTypeObject {
     property int s_width: size.width
     property int s_height: size.height
-    property var copy: size
+    property variant copy: size
 }
 
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/sizef_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/sizef_read.qml
index c6f34e4..96cd425 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/sizef_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/sizef_read.qml
@@ -3,7 +3,7 @@ import Test 1.0
 MyTypeObject {
     property real s_width: sizef.width
     property real s_height: sizef.height
-    property var copy: sizef
+    property variant copy: sizef
 }
 
 
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/sizereadonly_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/sizereadonly_read.qml
index 7abe359..7f708a0 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/sizereadonly_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/sizereadonly_read.qml
@@ -3,6 +3,6 @@ import Test 1.0
 MyTypeObject {
     property int s_width: sizereadonly.width
     property int s_height: sizereadonly.height
-    property var copy: sizereadonly
+    property variant copy: sizereadonly
 }
 
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_read.qml
index abdf9f0..f1e876d 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_read.qml
@@ -4,6 +4,6 @@ MyTypeObject {
     property real v_x: vector.x
     property real v_y: vector.y
     property real v_z: vector.z
-    property var copy: vector
+    property variant copy: vector
 }
 
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/worker.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/worker.qml
index 1fce155..ca989f8 100644
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/worker.qml
+++ b/tests/auto/declarative/qdeclarativeworkerscript/data/worker.qml
@@ -4,7 +4,7 @@ WorkerScript {
     id: worker
     source: "script.js"
 
-    property var response
+    property variant response
 
     signal done()
 
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml
index fbab4b7..0ddcca4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml
@@ -5,9 +5,9 @@ Rectangle {
     color: "gray"
     width: 200; height: 200
 
-    property var hours: 10
-    property var minutes: 28
-    property var seconds: 0
+    property variant hours: 10
+    property variant minutes: 28
+    property variant seconds: 0
 
     Timer {
         interval: 1000; running: true; repeat: true; triggeredOnStart: true
diff --git a/tests/auto/declarative/qmlvisual/webview/embedding/egg.qml b/tests/auto/declarative/qmlvisual/webview/embedding/egg.qml
index fe1bb70..711a747 100644
--- a/tests/auto/declarative/qmlvisual/webview/embedding/egg.qml
+++ b/tests/auto/declarative/qmlvisual/webview/embedding/egg.qml
@@ -1,8 +1,8 @@
 import Qt 4.6
 
 Item {
-    property var period : 250
-    property var color : "black"
+    property variant period : 250
+    property variant color : "black"
     id: root
 
     Item {
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
index 27c5646..972f405 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
@@ -9,7 +9,7 @@ QtObject {
     property url f
     property color g
     property date h
-    property var i
+    property variant i
     property variant j
 }