Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

148 files changed, 198 insertions, 197 deletions

diff --git a/examples/declarative/webview/content/Mapping/Map.qml b/examples/declarative/webview/content/Mapping/Map.qml
index 9bde031..aae6b5d 100644
--- a/examples/declarative/webview/content/Mapping/Map.qml
+++ b/examples/declarative/webview/content/Mapping/Map.qml
@@ -9,7 +9,7 @@ Item {
         id: map

         anchors.fill: parent

         url: "map.html"

-        javaScriptWindowObjects: Object {

+        javaScriptWindowObjects: QtObject {

             WebView.windowObjectName: "qml"

             property real lat: page.latitude

             property real lng: page.longitude

diff --git a/examples/declarative/webview/evalandattach.qml b/examples/declarative/webview/evalandattach.qml
index e755819..1b211c9 100644
--- a/examples/declarative/webview/evalandattach.qml
+++ b/examples/declarative/webview/evalandattach.qml
@@ -37,12 +37,12 @@ Item {
         focus: true
         settings.pluginsEnabled: true
         javaScriptWindowObjects: [
-        Object {
+        QtObject {
             id: txt
             WebView.windowObjectName: "statusText1"
             property string text: "Click me!"
         },
-        Object {
+        QtObject {
             id: txt2
             WebView.windowObjectName: "statusText2"
             property string text: ""
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 86472de..e292e5c 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -99,7 +99,7 @@ QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE)
 
-QML_DEFINE_TYPE(Qt,4,6,Object,QObject)
+QML_DEFINE_TYPE(Qt,4,6,QtObject,QObject)
 
 struct StaticQtMetaObject : public QObject
 {
diff --git a/tests/auto/declarative/parserstress/tst_parserstress.cpp b/tests/auto/declarative/parserstress/tst_parserstress.cpp
index dd8f347..e584140 100644
--- a/tests/auto/declarative/parserstress/tst_parserstress.cpp
+++ b/tests/auto/declarative/parserstress/tst_parserstress.cpp
@@ -115,7 +115,7 @@ void tst_parserstress::ecmascript()
 
     QString qml = "import Qt 4.6\n";
             qml+= "\n";
-            qml+= "Object {\n";
+            qml+= "QtObject {\n";
             qml+= "    property int test\n";
             qml+= "    test: {\n";
             qml+= dataStr + "\n";
diff --git a/tests/auto/declarative/qmlcontext/tst_qmlcontext.cpp b/tests/auto/declarative/qmlcontext/tst_qmlcontext.cpp
index 3c60b2b..f82f202 100644
--- a/tests/auto/declarative/qmlcontext/tst_qmlcontext.cpp
+++ b/tests/auto/declarative/qmlcontext/tst_qmlcontext.cpp
@@ -244,7 +244,7 @@ private:
 #define TEST_CONTEXT_PROPERTY(ctxt, name, value) \
 { \
     QmlComponent component(&engine); \
-    component.setData("import Qt 4.6; Object { property var test: " #name " }", QUrl()); \
+    component.setData("import Qt 4.6; QtObject { property var test: " #name " }", QUrl()); \
 \
     QObject *obj = component.create(ctxt); \
 \
@@ -294,7 +294,7 @@ void tst_qmlcontext::setContextProperty()
     // Changes in context properties
     {
         QmlComponent component(&engine); 
-        component.setData("import Qt 4.6; Object { property var test: a }", QUrl()); 
+        component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); 
 
         QObject *obj = component.create(&ctxt2); 
 
@@ -306,7 +306,7 @@ void tst_qmlcontext::setContextProperty()
     }
     {
         QmlComponent component(&engine); 
-        component.setData("import Qt 4.6; Object { property var test: b }", QUrl()); 
+        component.setData("import Qt 4.6; QtObject { property var test: b }", QUrl()); 
 
         QObject *obj = component.create(&ctxt2); 
 
@@ -320,7 +320,7 @@ void tst_qmlcontext::setContextProperty()
     }
     {
         QmlComponent component(&engine); 
-        component.setData("import Qt 4.6; Object { property var test: e.a }", QUrl()); 
+        component.setData("import Qt 4.6; QtObject { property var test: e.a }", QUrl()); 
 
         QObject *obj = component.create(&ctxt2); 
 
@@ -334,7 +334,7 @@ void tst_qmlcontext::setContextProperty()
     // New context properties
     {
         QmlComponent component(&engine); 
-        component.setData("import Qt 4.6; Object { property var test: a }", QUrl()); 
+        component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); 
 
         QObject *obj = component.create(&ctxt2); 
 
@@ -348,7 +348,7 @@ void tst_qmlcontext::setContextProperty()
     // Setting an object-variant context property
     {
         QmlComponent component(&engine);
-        component.setData("import Qt 4.6; Object { 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 var obj: root; }", QUrl());
 
         QmlContext ctxt(engine.rootContext());
         ctxt.setContextProperty("ctxtProp", QVariant());
@@ -400,7 +400,7 @@ void tst_qmlcontext::addDefaultObject()
     // Changes in context properties
     {
         QmlComponent component(&engine); 
-        component.setData("import Qt 4.6; Object { property var test: a }", QUrl()); 
+        component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); 
 
         QObject *obj = component.create(&ctxt); 
 
diff --git a/tests/auto/declarative/qmldom/tst_qmldom.cpp b/tests/auto/declarative/qmldom/tst_qmldom.cpp
index 9e1a2a8..6527b36 100644
--- a/tests/auto/declarative/qmldom/tst_qmldom.cpp
+++ b/tests/auto/declarative/qmldom/tst_qmldom.cpp
@@ -452,7 +452,7 @@ void tst_qmldom::loadDynamicProperty()
                          "    property date h\n"
                          "    property var i\n"
                          "    property variant j\n"
-                         "    property Object k\n"
+                         "    property QtObject k\n"
                          "}";
 
         QmlDomDocument document;
@@ -486,7 +486,7 @@ void tst_qmldom::loadDynamicProperty()
         DP_TEST(7, h, QVariant::Date, 168, 15, "date");
         DP_TEST(8, i, qMetaTypeId<QVariant>(), 188, 14, "var");
         DP_TEST(9, j, qMetaTypeId<QVariant>(), 207, 18, "variant");
-        DP_TEST(10, k, -1, 230, 17, "Object");
+        DP_TEST(10, k, -1, 230, 17, "QtObject");
     }
 
     {
@@ -494,7 +494,7 @@ void tst_qmldom::loadDynamicProperty()
                          "Item {\n"
                          "    property int a: 12\n"
                          "    property int b: a + 6\n"
-                         "    default property Object c\n"
+                         "    default property QtObject c\n"
                          "}\n";
 
         QmlDomDocument document;
diff --git a/tests/auto/declarative/qmlecmascript/data/NestedTypeTransientErrors.qml b/tests/auto/declarative/qmlecmascript/data/NestedTypeTransientErrors.qml
index e19bf24..7c32e56 100644
--- a/tests/auto/declarative/qmlecmascript/data/NestedTypeTransientErrors.qml
+++ b/tests/auto/declarative/qmlecmascript/data/NestedTypeTransientErrors.qml
@@ -1,10 +1,10 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property int b: obj.prop.a
 
     property var prop;
-    prop: Object {
+    prop: QtObject {
         property int a: 10
     }
 }
diff --git a/tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml b/tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml
index 6143164..7fdd8ca 100644
--- a/tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml
+++ b/tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml
@@ -5,7 +5,7 @@ MyQmlObject {
     property alias c1: MyObject.c1
     property int c2: 3
     property int c3: c2 
-    objectProperty: Object { 
+    objectProperty: QtObject { 
         id: MyObject 
         property int c1
     }
diff --git a/tests/auto/declarative/qmlecmascript/data/extendedObjectPropertyLookup.qml b/tests/auto/declarative/qmlecmascript/data/extendedObjectPropertyLookup.qml
index 8ff3aeb..ab379c1 100644
--- a/tests/auto/declarative/qmlecmascript/data/extendedObjectPropertyLookup.qml
+++ b/tests/auto/declarative/qmlecmascript/data/extendedObjectPropertyLookup.qml
@@ -1,7 +1,7 @@
 import Qt.test 1.0
 import Qt 4.6
 
-Object {
+QtObject {
     property MyExtendedObject a;
     a: MyExtendedObject { id: Root }
     property int b: Math.max(Root.extendedProperty, 0)
diff --git a/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.1.qml b/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.1.qml
index ccb3a22..b377b94 100644
--- a/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.1.qml
+++ b/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.1.qml
@@ -6,7 +6,7 @@ MyQmlObject {
 
     property var obj
 
-    obj: Object {
+    obj: QtObject {
         id: OtherObject
     }
 }
diff --git a/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.qml b/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.qml
index 6c1fca6..40cacf6 100644
--- a/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.qml
+++ b/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.qml
@@ -6,7 +6,7 @@ MyQmlObject {
 
     property var obj
 
-    obj: Object {
+    obj: QtObject {
         id: OtherObject
     }
 }
diff --git a/tests/auto/declarative/qmlecmascript/data/listProperties.qml b/tests/auto/declarative/qmlecmascript/data/listProperties.qml
index 73a1d6f..cae1721 100644
--- a/tests/auto/declarative/qmlecmascript/data/listProperties.qml
+++ b/tests/auto/declarative/qmlecmascript/data/listProperties.qml
@@ -5,14 +5,14 @@ MyQmlObject {
     id: root
 
     objectListProperty: [
-        Object { property int a: 10 },
-        Object { property int a: 11 }
+        QtObject { property int a: 10 },
+        QtObject { property int a: 11 }
     ]
 
     objectQmlListProperty: [
-        Object { property int a: 10 },
-        Object { property int a: 1 },
-        Object { property int a: 39 }
+        QtObject { property int a: 10 },
+        QtObject { property int a: 1 },
+        QtObject { property int a: 39 }
     ]
 
     Script {
diff --git a/tests/auto/declarative/qmlecmascript/data/methods.3.qml b/tests/auto/declarative/qmlecmascript/data/methods.3.qml
index 2efcf6a..79efc50 100644
--- a/tests/auto/declarative/qmlecmascript/data/methods.3.qml
+++ b/tests/auto/declarative/qmlecmascript/data/methods.3.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     function testFunction() { return 19; }
 
     property int test: testFunction()
diff --git a/tests/auto/declarative/qmlecmascript/data/scope.2.qml b/tests/auto/declarative/qmlecmascript/data/scope.2.qml
index 433a22e..8e5aa0b 100644
--- a/tests/auto/declarative/qmlecmascript/data/scope.2.qml
+++ b/tests/auto/declarative/qmlecmascript/data/scope.2.qml
@@ -9,17 +9,17 @@ Item {
         function c() { return 33; }
     }
 
-    Object {
+    QtObject {
         id: a
         property int value: 19
     }
 
-    Object {
+    QtObject {
         id: c
         property int value: 24
     }
 
-    Object {
+    QtObject {
         id: nested
         property int a: 1
         property int test: a.value
diff --git a/tests/auto/declarative/qmlecmascript/data/shutdownErrors.qml b/tests/auto/declarative/qmlecmascript/data/shutdownErrors.qml
index 398489a..5a19639 100644
--- a/tests/auto/declarative/qmlecmascript/data/shutdownErrors.qml
+++ b/tests/auto/declarative/qmlecmascript/data/shutdownErrors.qml
@@ -5,8 +5,8 @@ Item {
 
     Item {
         id: myObject
-        property Object object;
-        object: Object {
+        property QtObject object;
+        object: QtObject {
             property int a: 10
         }
     }
diff --git a/tests/auto/declarative/qmlecmascript/data/signalTriggeredBindings.qml b/tests/auto/declarative/qmlecmascript/data/signalTriggeredBindings.qml
index f65e253..7d419cd 100644
--- a/tests/auto/declarative/qmlecmascript/data/signalTriggeredBindings.qml
+++ b/tests/auto/declarative/qmlecmascript/data/signalTriggeredBindings.qml
@@ -6,7 +6,7 @@ MyQmlObject {
     property alias test1: myObject.test1
     property alias test2: myObject.test2
 
-    objectProperty: Object {
+    objectProperty: QtObject {
         id: myObject
         property real test1: base
         property real test2: Math.max(0, base)
diff --git a/tests/auto/declarative/qmlecmascript/data/transientErrors.qml b/tests/auto/declarative/qmlecmascript/data/transientErrors.qml
index 4e123c6..fa7e01c 100644
--- a/tests/auto/declarative/qmlecmascript/data/transientErrors.qml
+++ b/tests/auto/declarative/qmlecmascript/data/transientErrors.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property var obj: nested
 
     property var obj2
diff --git a/tests/auto/declarative/qmlengine/tst_qmlengine.cpp b/tests/auto/declarative/qmlengine/tst_qmlengine.cpp
index 5471691..8794af9 100644
--- a/tests/auto/declarative/qmlengine/tst_qmlengine.cpp
+++ b/tests/auto/declarative/qmlengine/tst_qmlengine.cpp
@@ -189,7 +189,7 @@ void tst_qmlengine::clearComponentCache()
     {
         QFile file("temp.qml");
         QVERIFY(file.open(QIODevice::WriteOnly));
-        file.write("import Qt 4.6\nObject {\nproperty int test: 10\n}\n");
+        file.write("import Qt 4.6\nQtObject {\nproperty int test: 10\n}\n");
         file.close();
     }
 
@@ -206,7 +206,7 @@ void tst_qmlengine::clearComponentCache()
     {
         QFile file("temp.qml");
         QVERIFY(file.open(QIODevice::WriteOnly));
-        file.write("import Qt 4.6\nObject {\nproperty int test: 11\n}\n");
+        file.write("import Qt 4.6\nQtObject {\nproperty int test: 11\n}\n");
         file.close();
     }
 
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml b/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml
index 28742f3..07eee88 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml
+++ b/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml
@@ -3,7 +3,7 @@ import Qt 4.6
 WebView {
     url: "javaScript.html"
     javaScriptWindowObjects: [
-        Object {
+        QtObject {
             property string qmlprop: "qmlvalue"
             WebView.windowObjectName: "myjsname"
         }
diff --git a/tests/auto/declarative/qmlinfo/data/NestedObject.qml b/tests/auto/declarative/qmlinfo/data/NestedObject.qml
index ac96d20..cd5b426 100644
--- a/tests/auto/declarative/qmlinfo/data/NestedObject.qml
+++ b/tests/auto/declarative/qmlinfo/data/NestedObject.qml
@@ -1,8 +1,8 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property var nested
 
-    nested:  Object {}
+    nested:  QtObject {}
 }
 
diff --git a/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml b/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml
index ee98354..a2ce78a 100644
--- a/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml
+++ b/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property var nested
     nested: NestedObject { }
     property var nested2: nested.nested
diff --git a/tests/auto/declarative/qmlinfo/data/qmlObject.qml b/tests/auto/declarative/qmlinfo/data/qmlObject.qml
index b86063b..ce05f89 100644
--- a/tests/auto/declarative/qmlinfo/data/qmlObject.qml
+++ b/tests/auto/declarative/qmlinfo/data/qmlObject.qml
@@ -1,8 +1,8 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property var nested
 
-    nested: Object {
+    nested: QtObject {
     }
 }
diff --git a/tests/auto/declarative/qmllanguage/data/Alias.qml b/tests/auto/declarative/qmllanguage/data/Alias.qml
index 8264e0d..af6187a 100644
--- a/tests/auto/declarative/qmllanguage/data/Alias.qml
+++ b/tests/auto/declarative/qmllanguage/data/Alias.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     id: Root
     property int value: 1892
     property alias aliasValue: Root.value
diff --git a/tests/auto/declarative/qmllanguage/data/Alias2.qml b/tests/auto/declarative/qmllanguage/data/Alias2.qml
index b7e81a5..6362b2d 100644
--- a/tests/auto/declarative/qmllanguage/data/Alias2.qml
+++ b/tests/auto/declarative/qmllanguage/data/Alias2.qml
@@ -1,7 +1,7 @@
 import Test 1.0
 import Qt 4.6
 
-Object {
+QtObject {
     property var other
     other: MyTypeObject { id: obj }
     property alias enumAlias: obj.enumProperty;
diff --git a/tests/auto/declarative/qmllanguage/data/ComponentComposite.qml b/tests/auto/declarative/qmllanguage/data/ComponentComposite.qml
index f8726ef..05fbc3f 100644
--- a/tests/auto/declarative/qmllanguage/data/ComponentComposite.qml
+++ b/tests/auto/declarative/qmllanguage/data/ComponentComposite.qml
@@ -1,5 +1,5 @@
 import Qt 4.6
 
 Component {
-    Object {}
+    QtObject {}
 }
diff --git a/tests/auto/declarative/qmllanguage/data/CompositeType.qml b/tests/auto/declarative/qmllanguage/data/CompositeType.qml
index 8c5094b..99d010f 100644
--- a/tests/auto/declarative/qmllanguage/data/CompositeType.qml
+++ b/tests/auto/declarative/qmllanguage/data/CompositeType.qml
@@ -1,4 +1,4 @@
 import Qt 4.6
 
-Object {
+QtObject {
 }
diff --git a/tests/auto/declarative/qmllanguage/data/CompositeType3.qml b/tests/auto/declarative/qmllanguage/data/CompositeType3.qml
index bb5469a..d08f35b 100644
--- a/tests/auto/declarative/qmllanguage/data/CompositeType3.qml
+++ b/tests/auto/declarative/qmllanguage/data/CompositeType3.qml
@@ -1,5 +1,5 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property int a
 }
diff --git a/tests/auto/declarative/qmllanguage/data/DynamicPropertiesNestedType.qml b/tests/auto/declarative/qmllanguage/data/DynamicPropertiesNestedType.qml
index 5c2edb4..aefbf9a 100644
--- a/tests/auto/declarative/qmllanguage/data/DynamicPropertiesNestedType.qml
+++ b/tests/auto/declarative/qmllanguage/data/DynamicPropertiesNestedType.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property int super_a: 10
     property int super_c: 14
 }
diff --git a/tests/auto/declarative/qmllanguage/data/NestedAlias.qml b/tests/auto/declarative/qmllanguage/data/NestedAlias.qml
index 93a5454..5155612 100644
--- a/tests/auto/declarative/qmllanguage/data/NestedAlias.qml
+++ b/tests/auto/declarative/qmllanguage/data/NestedAlias.qml
@@ -1,13 +1,13 @@
 import Qt 4.6
 
-Object {
-    property Object o1
-    property Object o2
+QtObject {
+    property QtObject o1
+    property QtObject o2
 
     property alias a: object2.a
 
-    o1: Object { id: object1 }
-    o2: Object { 
+    o1: QtObject { id: object1 }
+    o2: QtObject { 
         id: object2 
         property int a: 1923
     }
diff --git a/tests/auto/declarative/qmllanguage/data/alias.1.qml b/tests/auto/declarative/qmllanguage/data/alias.1.qml
index 492d99a..3ad8f38 100644
--- a/tests/auto/declarative/qmllanguage/data/alias.1.qml
+++ b/tests/auto/declarative/qmllanguage/data/alias.1.qml
@@ -1,7 +1,7 @@
 import Test 1.0
 import Qt 4.6
 
-Object {
+QtObject {
     id: Root
     property int value: 10
     property alias valueAlias: Root.value
diff --git a/tests/auto/declarative/qmllanguage/data/alias.3.qml b/tests/auto/declarative/qmllanguage/data/alias.3.qml
index e25fbae..fa8a253 100644
--- a/tests/auto/declarative/qmllanguage/data/alias.3.qml
+++ b/tests/auto/declarative/qmllanguage/data/alias.3.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
    property var other
    other: Alias { id: MyAliasObject }
 
diff --git a/tests/auto/declarative/qmllanguage/data/alias.5.qml b/tests/auto/declarative/qmllanguage/data/alias.5.qml
index 39bfd9b..4316d0d 100644
--- a/tests/auto/declarative/qmllanguage/data/alias.5.qml
+++ b/tests/auto/declarative/qmllanguage/data/alias.5.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 import Test 1.0
 
-Object {
+QtObject {
     property alias otherAlias: otherObject
 
     property var other 
diff --git a/tests/auto/declarative/qmllanguage/data/alias.6.qml b/tests/auto/declarative/qmllanguage/data/alias.6.qml
index aac0ef3..e3af230 100644
--- a/tests/auto/declarative/qmllanguage/data/alias.6.qml
+++ b/tests/auto/declarative/qmllanguage/data/alias.6.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
-Object {
-    property Object o;
+QtObject {
+    property QtObject o;
     property alias a: object.a
     o: NestedAlias { id: object }
 }
diff --git a/tests/auto/declarative/qmllanguage/data/alias.7.qml b/tests/auto/declarative/qmllanguage/data/alias.7.qml
index d3cf5fe..a9a57eb 100644
--- a/tests/auto/declarative/qmllanguage/data/alias.7.qml
+++ b/tests/auto/declarative/qmllanguage/data/alias.7.qml
@@ -1,14 +1,14 @@
 import Qt 4.6
 
-Object {
-    property Object object
+QtObject {
+    property QtObject object
     property alias aliasedObject: target.object
 
-    object: Object {
+    object: QtObject {
         id: target
 
-        property Object object
-        object: Object {}
+        property QtObject object
+        object: QtObject {}
     }
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/assignCompositeToType.qml b/tests/auto/declarative/qmllanguage/data/assignCompositeToType.qml
index ec2867d..f6422bd 100644
--- a/tests/auto/declarative/qmllanguage/data/assignCompositeToType.qml
+++ b/tests/auto/declarative/qmllanguage/data/assignCompositeToType.qml
@@ -1,11 +1,11 @@
 import Qt 4.6
 import Test 1.0
 
-Object {
-    property Object myProperty
-    property Object myProperty2
-    property Object myProperty3
-    property Object myProperty4
+QtObject {
+    property QtObject myProperty
+    property QtObject myProperty2
+    property QtObject myProperty3
+    property QtObject myProperty4
     property MyQmlObject myProperty5
     property MyQmlObject myProperty6
 
diff --git a/tests/auto/declarative/qmllanguage/data/assignObjectToVariant.qml b/tests/auto/declarative/qmllanguage/data/assignObjectToVariant.qml
index 28c68c4..0ff9370 100644
--- a/tests/auto/declarative/qmllanguage/data/assignObjectToVariant.qml
+++ b/tests/auto/declarative/qmllanguage/data/assignObjectToVariant.qml
@@ -1,6 +1,7 @@
 import Test 1.0
 import Qt 4.6
-Object {
+
+QtObject {
     property var a;
     a: MyQmlObject {}
 }
diff --git a/tests/auto/declarative/qmllanguage/data/attachedProperties.qml b/tests/auto/declarative/qmllanguage/data/attachedProperties.qml
index fec96cc..b46ec34 100644
--- a/tests/auto/declarative/qmllanguage/data/attachedProperties.qml
+++ b/tests/auto/declarative/qmllanguage/data/attachedProperties.qml
@@ -2,7 +2,7 @@ import Test 1.0
 import Test 1.0 as Namespace
 import Qt 4.6
 
-Object {
+QtObject {
     MyQmlObject.value: 10
     Namespace.MyQmlObject.value2: 13
 }
diff --git a/tests/auto/declarative/qmllanguage/data/component.2.qml b/tests/auto/declarative/qmllanguage/data/component.2.qml
index 74a4f89..88e0f73 100644
--- a/tests/auto/declarative/qmllanguage/data/component.2.qml
+++ b/tests/auto/declarative/qmllanguage/data/component.2.qml
@@ -4,6 +4,6 @@ Item {
     id: myId
     Component {
         id: myId
-        Object {}
+        QtObject {}
     }
 }
diff --git a/tests/auto/declarative/qmllanguage/data/component.3.qml b/tests/auto/declarative/qmllanguage/data/component.3.qml
index 043cb6b..287a959 100644
--- a/tests/auto/declarative/qmllanguage/data/component.3.qml
+++ b/tests/auto/declarative/qmllanguage/data/component.3.qml
@@ -4,6 +4,6 @@ Item {
     Component {
         id: myId
         id: myId2
-        Object {}
+        QtObject {}
     }
 }
diff --git a/tests/auto/declarative/qmllanguage/data/component.4.qml b/tests/auto/declarative/qmllanguage/data/component.4.qml
index 3d115ba..ab1e29b 100644
--- a/tests/auto/declarative/qmllanguage/data/component.4.qml
+++ b/tests/auto/declarative/qmllanguage/data/component.4.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
 Component {
-    Object {}
-    Object {}
+    QtObject {}
+    QtObject {}
 }
diff --git a/tests/auto/declarative/qmllanguage/data/component.5.qml b/tests/auto/declarative/qmllanguage/data/component.5.qml
index ab57622..629e998 100644
--- a/tests/auto/declarative/qmllanguage/data/component.5.qml
+++ b/tests/auto/declarative/qmllanguage/data/component.5.qml
@@ -2,5 +2,5 @@ import Qt 4.6
 
 Component {
     x: 10
-    Object {}
+    QtObject {}
 }
diff --git a/tests/auto/declarative/qmllanguage/data/component.6.qml b/tests/auto/declarative/qmllanguage/data/component.6.qml
index 6adaf0d..2303ebf 100644
--- a/tests/auto/declarative/qmllanguage/data/component.6.qml
+++ b/tests/auto/declarative/qmllanguage/data/component.6.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
 Component {
-    id: Object {}
-    Object {}
+    id: QtObject {}
+    QtObject {}
 }
diff --git a/tests/auto/declarative/qmllanguage/data/componentCompositeType.qml b/tests/auto/declarative/qmllanguage/data/componentCompositeType.qml
index 3a1b191..0a7249a 100644
--- a/tests/auto/declarative/qmllanguage/data/componentCompositeType.qml
+++ b/tests/auto/declarative/qmllanguage/data/componentCompositeType.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property var test
 
     test: ComponentComposite {}
diff --git a/tests/auto/declarative/qmllanguage/data/crash2.qml b/tests/auto/declarative/qmllanguage/data/crash2.qml
index ae6f650..a22c776 100644
--- a/tests/auto/declarative/qmllanguage/data/crash2.qml
+++ b/tests/auto/declarative/qmllanguage/data/crash2.qml
@@ -1,5 +1,5 @@
 import Qt 4.6
 
-Object {
+QtObject {
     objectName: "Hello" + "World"
 }
diff --git a/tests/auto/declarative/qmllanguage/data/defaultGrouped.qml b/tests/auto/declarative/qmllanguage/data/defaultGrouped.qml
index 39ac5e0..532b2bb 100644
--- a/tests/auto/declarative/qmllanguage/data/defaultGrouped.qml
+++ b/tests/auto/declarative/qmllanguage/data/defaultGrouped.qml
@@ -4,7 +4,7 @@ import Qt 4.6
 MyTypeObject {
     grouped {
         script: print(1921)
-        Object {}
+        QtObject {}
     }
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/dynamicObjectProperties.qml b/tests/auto/declarative/qmllanguage/data/dynamicObjectProperties.qml
index e69ccee..c80a7c0 100644
--- a/tests/auto/declarative/qmllanguage/data/dynamicObjectProperties.qml
+++ b/tests/auto/declarative/qmllanguage/data/dynamicObjectProperties.qml
@@ -2,10 +2,10 @@ import Test 1.0
 import Qt 4.6
 import Qt 4.6 as Qt
 
-Object {
-    property Object objectProperty
-    property Object objectProperty2
-    objectProperty2: Object {}
+QtObject {
+    property QtObject objectProperty
+    property QtObject objectProperty2
+    objectProperty2: QtObject {}
 
     property MyComponent myComponentProperty
     property MyComponent myComponentProperty2 
diff --git a/tests/auto/declarative/qmllanguage/data/dynamicProperties.qml b/tests/auto/declarative/qmllanguage/data/dynamicProperties.qml
index 17fa974..aef3269 100644
--- a/tests/auto/declarative/qmllanguage/data/dynamicProperties.qml
+++ b/tests/auto/declarative/qmllanguage/data/dynamicProperties.qml
@@ -1,6 +1,6 @@
 import Test 1.0
 import Qt 4.6
-Object {
+QtObject {
     default property int intProperty : 10
     property bool boolProperty: false
     property double doubleProperty: -10.1
diff --git a/tests/auto/declarative/qmllanguage/data/dynamicSignalsAndSlots.qml b/tests/auto/declarative/qmllanguage/data/dynamicSignalsAndSlots.qml
index 72ec218..737681e 100644
--- a/tests/auto/declarative/qmllanguage/data/dynamicSignalsAndSlots.qml
+++ b/tests/auto/declarative/qmllanguage/data/dynamicSignalsAndSlots.qml
@@ -1,5 +1,5 @@
 import Qt 4.6
-Object {
+QtObject {
     signal signal1
     function slot1() {}
     signal signal2
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.qml
index e99c635..324f79c 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.qml
@@ -1,7 +1,7 @@
 import Test 1.0
 import Qt 4.6
 
-Object {
+QtObject {
     MyQmlObject.foo: 10
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.qml
index 8f987ce..b768e9f 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.qml
@@ -1,6 +1,6 @@
 import Test 1.0 as Namespace
 import Qt 4.6
 
-Object {
+QtObject {
     Namespace.MadeUpClass.foo: 10
 }
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.qml
index 18770fc..7b782be 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.qml
@@ -1,7 +1,7 @@
 import Test 1.0 as Namespace
 import Qt 4.6
 
-Object {
+QtObject {
     Namespace.madeUpClass.foo: 10
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.qml
index 3c9ae5b..1f47c61 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.qml
@@ -1,6 +1,6 @@
 import Test 1.0 as Namespace
 import Qt 4.6
 
-Object {
+QtObject {
     Namespace.MyQmlObject.foo: 10
 }
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.qml
index e9405a4..79c2981 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.qml
@@ -1,7 +1,7 @@
 import Test 1.0
 import Qt 4.6
 
-Object {
+QtObject {
     MyQmlObject: 10
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.qml
index 6fbf718..af0be80 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.qml
@@ -1,7 +1,7 @@
 import Test 1.0 as Namespace
 import Qt 4.6
 
-Object {
+QtObject {
     Namespace.MyQmlObject: 10
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.qml
index 1827a16..0546322 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.qml
@@ -1,7 +1,7 @@
 import Test 1.0
 import Qt 4.6
 
-Object {
-    MyQmlObject: Object {}
+QtObject {
+    MyQmlObject: QtObject {}
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.qml
index 5c7f0ec..108109a 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.qml
@@ -1,7 +1,7 @@
 import Test 1.0
 import Qt 4.6
 
-Object {
-    Test.MyQmlObject: Object {}
+QtObject {
+    Test.MyQmlObject: QtObject {}
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.qml
index 841cc08..ccf0353 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.qml
@@ -1,6 +1,6 @@
 import Test 1.0
 import Qt 4.6
 
-Object {
+QtObject {
     MyTypeObject.foo: 10
 }
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.qml
index f1b4b96..e736379 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.qml
@@ -1,6 +1,6 @@
 import Test 1.0 as Namespace
 import Qt 4.6
 
-Object {
+QtObject {
     Namespace.MyTypeObject.foo: 10
 }
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.qml
index 99c4a5c..a095229 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.qml
@@ -1,7 +1,7 @@
 import Test 1.0
 import Qt 4.6
 
-Object {
+QtObject {
     MadeUpClass.foo: 10
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.qml b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.qml
index 5e95c48..1167e39 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.qml
@@ -1,6 +1,6 @@
 import Qt 4.6 
 
-Object {
+QtObject {
     property var o;
     o.blah: 10
 }
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.qml b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.qml
index b11d34c..a0c8306 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.qml
@@ -1,6 +1,6 @@
 import Qt 4.6 
 
-Object {
+QtObject {
     property int o;
     o.blah: 10
 }
diff --git a/tests/auto/declarative/qmllanguage/data/invalidImportID.qml b/tests/auto/declarative/qmllanguage/data/invalidImportID.qml
index 75aa06d..30d88d5 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidImportID.qml
+++ b/tests/auto/declarative/qmllanguage/data/invalidImportID.qml
@@ -1,4 +1,4 @@
 import Qt 4.6
 import Qt 4.6 as qt
 
-Object {}
+QtObject {}
diff --git a/tests/auto/declarative/qmllanguage/data/listProperties.qml b/tests/auto/declarative/qmllanguage/data/listProperties.qml
index c39ceae..ba9e37c 100644
--- a/tests/auto/declarative/qmllanguage/data/listProperties.qml
+++ b/tests/auto/declarative/qmllanguage/data/listProperties.qml
@@ -1,9 +1,9 @@
 import Qt 4.6
 
-Object {
-    property list<Object> listProperty
+QtObject {
+    property list<QtObject> listProperty
     property int test: listProperty.length
 
-    listProperty: [ Object{}, Object {} ]
+    listProperty: [ QtObject{}, QtObject {} ]
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/missingSignal.qml b/tests/auto/declarative/qmllanguage/data/missingSignal.qml
index fd489ca..8a87437 100644
--- a/tests/auto/declarative/qmllanguage/data/missingSignal.qml
+++ b/tests/auto/declarative/qmllanguage/data/missingSignal.qml
@@ -1,5 +1,5 @@
 import Test 1.0
 import Qt 4.6
-Object {
+QtObject {
     onClicked: print("Hello world!")
 }
diff --git a/tests/auto/declarative/qmllanguage/data/property.1.qml b/tests/auto/declarative/qmllanguage/data/property.1.qml
index 62178e5..cadc39a 100644
--- a/tests/auto/declarative/qmllanguage/data/property.1.qml
+++ b/tests/auto/declarative/qmllanguage/data/property.1.qml
@@ -1,5 +1,5 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property blah a;
 }
diff --git a/tests/auto/declarative/qmllanguage/data/property.2.qml b/tests/auto/declarative/qmllanguage/data/property.2.qml
index 1d6d015..e810c6c 100644
--- a/tests/auto/declarative/qmllanguage/data/property.2.qml
+++ b/tests/auto/declarative/qmllanguage/data/property.2.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property invalidmodifier<int> a;
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/property.3.qml b/tests/auto/declarative/qmllanguage/data/property.3.qml
index 1b14b86..04147c2 100644
--- a/tests/auto/declarative/qmllanguage/data/property.3.qml
+++ b/tests/auto/declarative/qmllanguage/data/property.3.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
-Object {
-    property invalidmodifier<Object> a;
+QtObject {
+    property invalidmodifier<QtObject> a;
 }
 
 
diff --git a/tests/auto/declarative/qmllanguage/data/property.4.qml b/tests/auto/declarative/qmllanguage/data/property.4.qml
index d256c96..b2ec482 100644
--- a/tests/auto/declarative/qmllanguage/data/property.4.qml
+++ b/tests/auto/declarative/qmllanguage/data/property.4.qml
@@ -1,5 +1,5 @@
 import Qt 4.6
 
-Object {
+QtObject {
     readonly property int a
 }
diff --git a/tests/auto/declarative/qmllanguage/data/property.5.qml b/tests/auto/declarative/qmllanguage/data/property.5.qml
index c3aaf5e..65fafbb 100644
--- a/tests/auto/declarative/qmllanguage/data/property.5.qml
+++ b/tests/auto/declarative/qmllanguage/data/property.5.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     readonly property int a: value
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.1.qml b/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.1.qml
index 99a9746..429c327 100644
--- a/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.1.qml
+++ b/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.1.qml
@@ -1,5 +1,5 @@
 import Test 1.0
 import Qt 4.6
-Object {
+QtObject {
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.2.qml b/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.2.qml
index 8179dbd..0f57b61 100644
--- a/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.2.qml
+++ b/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.2.qml
@@ -1,6 +1,6 @@
 import Test 1.0
 import Qt 4.6
-Object {
+QtObject {
     MyQmlObject.value: 10
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/script.11.qml b/tests/auto/declarative/qmllanguage/data/script.11.qml
index d8313a3..6d2d598 100644
--- a/tests/auto/declarative/qmllanguage/data/script.11.qml
+++ b/tests/auto/declarative/qmllanguage/data/script.11.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
-Object {
+QtObject {
     Script {
-        Object {}
+        QtObject {}
     }
 }
diff --git a/tests/auto/declarative/qmllanguage/data/script.12.qml b/tests/auto/declarative/qmllanguage/data/script.12.qml
index ea6c482..9ecb5d9 100644
--- a/tests/auto/declarative/qmllanguage/data/script.12.qml
+++ b/tests/auto/declarative/qmllanguage/data/script.12.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     var a
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/script.2.qml b/tests/auto/declarative/qmllanguage/data/script.2.qml
index 18bb7c8..dce1a41 100644
--- a/tests/auto/declarative/qmllanguage/data/script.2.qml
+++ b/tests/auto/declarative/qmllanguage/data/script.2.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     Script {
         id: myScript
     }
diff --git a/tests/auto/declarative/qmllanguage/data/script.3.qml b/tests/auto/declarative/qmllanguage/data/script.3.qml
index c2296ff..8621a9a 100644
--- a/tests/auto/declarative/qmllanguage/data/script.3.qml
+++ b/tests/auto/declarative/qmllanguage/data/script.3.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     Script {
         hello: world
     }
diff --git a/tests/auto/declarative/qmllanguage/data/script.4.qml b/tests/auto/declarative/qmllanguage/data/script.4.qml
index 08115c2..d89817c 100644
--- a/tests/auto/declarative/qmllanguage/data/script.4.qml
+++ b/tests/auto/declarative/qmllanguage/data/script.4.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     Script {
         source: 10
     }
diff --git a/tests/auto/declarative/qmllanguage/data/script.5.qml b/tests/auto/declarative/qmllanguage/data/script.5.qml
index a3b1a15..8986b3b 100644
--- a/tests/auto/declarative/qmllanguage/data/script.5.qml
+++ b/tests/auto/declarative/qmllanguage/data/script.5.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     Script {
         source: "hello" + ".js"
     }
diff --git a/tests/auto/declarative/qmllanguage/data/script.6.qml b/tests/auto/declarative/qmllanguage/data/script.6.qml
index e578629..07e9d78 100644
--- a/tests/auto/declarative/qmllanguage/data/script.6.qml
+++ b/tests/auto/declarative/qmllanguage/data/script.6.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     Script {
         source: "test.js"
         function helloWorld() {}
diff --git a/tests/auto/declarative/qmllanguage/data/script.7.qml b/tests/auto/declarative/qmllanguage/data/script.7.qml
index 6bee3f9..fa905e6 100644
--- a/tests/auto/declarative/qmllanguage/data/script.7.qml
+++ b/tests/auto/declarative/qmllanguage/data/script.7.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     Script {
         var a = 10;
     }
diff --git a/tests/auto/declarative/qmllanguage/data/script.8.qml b/tests/auto/declarative/qmllanguage/data/script.8.qml
index 55bc05c..f600c88 100644
--- a/tests/auto/declarative/qmllanguage/data/script.8.qml
+++ b/tests/auto/declarative/qmllanguage/data/script.8.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     Script {
         source: "test.js"
         source: "test2.js"
diff --git a/tests/auto/declarative/qmllanguage/data/signal.1.qml b/tests/auto/declarative/qmllanguage/data/signal.1.qml
index d0ad155..fbaf017 100644
--- a/tests/auto/declarative/qmllanguage/data/signal.1.qml
+++ b/tests/auto/declarative/qmllanguage/data/signal.1.qml
@@ -1,5 +1,5 @@
 import Qt 4.6
 
-Object {
+QtObject {
     signal mySignal(nontype a)
 }
diff --git a/tests/auto/declarative/qmllanguage/data/signal.2.qml b/tests/auto/declarative/qmllanguage/data/signal.2.qml
index aa45ae9..5049192 100644
--- a/tests/auto/declarative/qmllanguage/data/signal.2.qml
+++ b/tests/auto/declarative/qmllanguage/data/signal.2.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     signal mySignal(,)
 }
 
diff --git a/tests/auto/declarative/qmllanguage/data/signal.3.qml b/tests/auto/declarative/qmllanguage/data/signal.3.qml
index f38ccc5..9dd4cc7 100644
--- a/tests/auto/declarative/qmllanguage/data/signal.3.qml
+++ b/tests/auto/declarative/qmllanguage/data/signal.3.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     signal mySignal(a)
 }
 
diff --git a/tests/auto/declarative/qmlqt/data/closestangle.qml b/tests/auto/declarative/qmlqt/data/closestangle.qml
index 8f999e3..b5f7fc6 100644
--- a/tests/auto/declarative/qmlqt/data/closestangle.qml
+++ b/tests/auto/declarative/qmlqt/data/closestangle.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property var testSame: Qt.closestAngle(0,1)
     property var testLess: Qt.closestAngle(0,-359)
     property var testMore: Qt.closestAngle(0,361)
diff --git a/tests/auto/declarative/qmlqt/data/createComponent.qml b/tests/auto/declarative/qmlqt/data/createComponent.qml
index 57f50d8..d9b70ec 100644
--- a/tests/auto/declarative/qmlqt/data/createComponent.qml
+++ b/tests/auto/declarative/qmlqt/data/createComponent.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool incorrectArgCount1: false
     property bool incorrectArgCount2: false
     property bool emptyArg: false
diff --git a/tests/auto/declarative/qmlqt/data/createComponentData.qml b/tests/auto/declarative/qmlqt/data/createComponentData.qml
index 145fe78..a5e99a0 100644
--- a/tests/auto/declarative/qmlqt/data/createComponentData.qml
+++ b/tests/auto/declarative/qmlqt/data/createComponentData.qml
@@ -1,5 +1,5 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property int test: 1913
 }
diff --git a/tests/auto/declarative/qmlqt/data/createQmlObject.qml b/tests/auto/declarative/qmlqt/data/createQmlObject.qml
index 8e8919a..9150782 100644
--- a/tests/auto/declarative/qmlqt/data/createQmlObject.qml
+++ b/tests/auto/declarative/qmlqt/data/createQmlObject.qml
@@ -16,14 +16,14 @@ Item {
     Component.onCompleted: {
         // errors
         incorrectArgCount1 = (createQmlObject() == null);
-        incorrectArgCount2 = (createQmlObject("import Qt 4.6\nObject{}", root, "main.qml", 10) == null);
+        incorrectArgCount2 = (createQmlObject("import Qt 4.6\nQtObject{}", root, "main.qml", 10) == null);
         emptyArg = (createQmlObject("", root) == null);
-        errors = (createQmlObject("import Qt 4.6\nObject{\nproperty int test: 13\nproperty int test: 13\n}", root, "main.qml") == null);
-        noParent = (createQmlObject("import Qt 4.6\nObject{\nproperty int test: 13}", 0) == null);
-        notReady = (createQmlObject("import Qt 4.6\nObject{\nBlah{}\n}", root, "http://www.example.com/main.qml") == null);
-        runtimeError = (createQmlObject("import Qt 4.6\nObject{property int test\nonTestChanged: Object{}\n}", root) == null);
+        errors = (createQmlObject("import Qt 4.6\nQtObject{\nproperty int test: 13\nproperty int test: 13\n}", root, "main.qml") == null);
+        noParent = (createQmlObject("import Qt 4.6\nQtObject{\nproperty int test: 13}", 0) == null);
+        notReady = (createQmlObject("import Qt 4.6\nQtObject{\nBlah{}\n}", root, "http://www.example.com/main.qml") == null);
+        runtimeError = (createQmlObject("import Qt 4.6\nQtObject{property int test\nonTestChanged: QtObject{}\n}", root) == null);
 
-        var o = createQmlObject("import Qt 4.6\nObject{\nproperty int test: 13\n}", root);
+        var o = createQmlObject("import Qt 4.6\nQtObject{\nproperty int test: 13\n}", root);
         success = (o.test == 13);
 
         createQmlObject("import Qt 4.6\nItem {}\n", root);
diff --git a/tests/auto/declarative/qmlqt/data/darker.qml b/tests/auto/declarative/qmlqt/data/darker.qml
index 96ffa77..2df067e 100644
--- a/tests/auto/declarative/qmlqt/data/darker.qml
+++ b/tests/auto/declarative/qmlqt/data/darker.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+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)
diff --git a/tests/auto/declarative/qmlqt/data/enums.qml b/tests/auto/declarative/qmlqt/data/enums.qml
index f87886e..1efa6f5 100644
--- a/tests/auto/declarative/qmlqt/data/enums.qml
+++ b/tests/auto/declarative/qmlqt/data/enums.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property int test1: Qt.Key_Escape
     property int test2: Qt.DescendingOrder
     property int test3: Qt.ElideMiddle
diff --git a/tests/auto/declarative/qmlqt/data/hsla.qml b/tests/auto/declarative/qmlqt/data/hsla.qml
index fedb56a..df51ccd 100644
--- a/tests/auto/declarative/qmlqt/data/hsla.qml
+++ b/tests/auto/declarative/qmlqt/data/hsla.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property color test1: Qt.hsla(1, 0, 0, 0.8);
     property color test2: Qt.hsla(1, 0.5, 0.3);
     property color test3: Qt.hsla(1, 1);
diff --git a/tests/auto/declarative/qmlqt/data/lighter.qml b/tests/auto/declarative/qmlqt/data/lighter.qml
index 2e9fdc8..4e0c431 100644
--- a/tests/auto/declarative/qmlqt/data/lighter.qml
+++ b/tests/auto/declarative/qmlqt/data/lighter.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+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)
diff --git a/tests/auto/declarative/qmlqt/data/md5.qml b/tests/auto/declarative/qmlqt/data/md5.qml
index 3c96a6b..c474b71 100644
--- a/tests/auto/declarative/qmlqt/data/md5.qml
+++ b/tests/auto/declarative/qmlqt/data/md5.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string test1: Qt.md5()
     property string test2: Qt.md5("Hello World")
 }
diff --git a/tests/auto/declarative/qmlqt/data/point.qml b/tests/auto/declarative/qmlqt/data/point.qml
index 582cb00..c383beb 100644
--- a/tests/auto/declarative/qmlqt/data/point.qml
+++ b/tests/auto/declarative/qmlqt/data/point.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property var test1: Qt.point(19, 34);
     property var test2: Qt.point(-3, 109.2);
     property var test3: Qt.point(-3);
diff --git a/tests/auto/declarative/qmlqt/data/rect.qml b/tests/auto/declarative/qmlqt/data/rect.qml
index 53d8c38..82b6428 100644
--- a/tests/auto/declarative/qmlqt/data/rect.qml
+++ b/tests/auto/declarative/qmlqt/data/rect.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+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);
diff --git a/tests/auto/declarative/qmlqt/data/rgba.qml b/tests/auto/declarative/qmlqt/data/rgba.qml
index 3fdfe2c..6dd6565 100644
--- a/tests/auto/declarative/qmlqt/data/rgba.qml
+++ b/tests/auto/declarative/qmlqt/data/rgba.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property color test1: Qt.rgba(1, 0, 0, 0.8);
     property color test2: Qt.rgba(1, 0.5, 0.3);
     property color test3: Qt.rgba(1, 1);
diff --git a/tests/auto/declarative/qmlqt/data/size.qml b/tests/auto/declarative/qmlqt/data/size.qml
index f0d2e81..05b0317 100644
--- a/tests/auto/declarative/qmlqt/data/size.qml
+++ b/tests/auto/declarative/qmlqt/data/size.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property var test1: Qt.size(19, 34);
     property var test2: Qt.size(3, 109.2);
     property var test3: Qt.size(-3, 10);
diff --git a/tests/auto/declarative/qmlqt/data/tint.qml b/tests/auto/declarative/qmlqt/data/tint.qml
index 31e67ba..da8afe2 100644
--- a/tests/auto/declarative/qmlqt/data/tint.qml
+++ b/tests/auto/declarative/qmlqt/data/tint.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property color test1: Qt.tint("red", "blue");
     property color test2: Qt.tint(Qt.rgba(1, 0, 0), Qt.rgba(0, 0, 0, 0));
     property color test3: Qt.tint("red", Qt.rgba(0, 0, 1, 0.5)); // XXX - what should this be?
diff --git a/tests/auto/declarative/qmlqt/data/vector.qml b/tests/auto/declarative/qmlqt/data/vector.qml
index b879bd6..a471c7a 100644
--- a/tests/auto/declarative/qmlqt/data/vector.qml
+++ b/tests/auto/declarative/qmlqt/data/vector.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+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);
diff --git a/tests/auto/declarative/visual/webview/javascript/evaluateJavaScript.qml b/tests/auto/declarative/visual/webview/javascript/evaluateJavaScript.qml
index d3cf578..78d5cfc 100644
--- a/tests/auto/declarative/visual/webview/javascript/evaluateJavaScript.qml
+++ b/tests/auto/declarative/visual/webview/javascript/evaluateJavaScript.qml
@@ -7,7 +7,7 @@ Column {
         height: 200
         url: "test-objects.html"
         javaScriptWindowObjects:
-            Object {
+            QtObject {
                 property string text: btntext.text
                 WebView.windowObjectName: "qmltext"
                 onTextChanged: {
diff --git a/tests/auto/declarative/visual/webview/javascript/windowObjects.qml b/tests/auto/declarative/visual/webview/javascript/windowObjects.qml
index f1d4097..a41de9a 100644
--- a/tests/auto/declarative/visual/webview/javascript/windowObjects.qml
+++ b/tests/auto/declarative/visual/webview/javascript/windowObjects.qml
@@ -6,7 +6,7 @@ Column {
         height: 200
         url: "test-objects.html"
         javaScriptWindowObjects:
-            Object {
+            QtObject {
                 property string text: btntext.text
                 WebView.windowObjectName: "qmltext"
             }
diff --git a/tests/auto/declarative/xmlhttprequest/data/abort.qml b/tests/auto/declarative/xmlhttprequest/data/abort.qml
index 132eb96..d7b9266 100644
--- a/tests/auto/declarative/xmlhttprequest/data/abort.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/abort.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string urlDummy
     property string url
 
diff --git a/tests/auto/declarative/xmlhttprequest/data/abort_opened.qml b/tests/auto/declarative/xmlhttprequest/data/abort_opened.qml
index 9c7449f..72a45e7 100644
--- a/tests/auto/declarative/xmlhttprequest/data/abort_opened.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/abort_opened.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url: "testdocument.html"
 
     property bool readyState: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/abort_unsent.qml b/tests/auto/declarative/xmlhttprequest/data/abort_unsent.qml
index 4bc479e..aa78cde 100644
--- a/tests/auto/declarative/xmlhttprequest/data/abort_unsent.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/abort_unsent.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url: "testdocument.html"
 
     property bool readyState: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/attr.qml b/tests/auto/declarative/xmlhttprequest/data/attr.qml
index d0ee720..9049fc7 100644
--- a/tests/auto/declarative/xmlhttprequest/data/attr.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/attr.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool xmlTest: false
     property bool dataOK: false
 
diff --git a/tests/auto/declarative/xmlhttprequest/data/cdata.qml b/tests/auto/declarative/xmlhttprequest/data/cdata.qml
index 5faa359..b2d0209 100644
--- a/tests/auto/declarative/xmlhttprequest/data/cdata.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/cdata.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool xmlTest: false
     property bool dataOK: false
 
diff --git a/tests/auto/declarative/xmlhttprequest/data/constructor.qml b/tests/auto/declarative/xmlhttprequest/data/constructor.qml
index 4b9e9ce..93e44fd 100644
--- a/tests/auto/declarative/xmlhttprequest/data/constructor.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/constructor.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool calledAsConstructor
     property bool calledAsFunction
 
diff --git a/tests/auto/declarative/xmlhttprequest/data/defaultState.qml b/tests/auto/declarative/xmlhttprequest/data/defaultState.qml
index 5cc2971..4dcf6f9 100644
--- a/tests/auto/declarative/xmlhttprequest/data/defaultState.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/defaultState.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property int readyState
     property bool statusIsException: false
     property bool statusTextIsException: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/document.qml b/tests/auto/declarative/xmlhttprequest/data/document.qml
index ce9e35f..e372361 100644
--- a/tests/auto/declarative/xmlhttprequest/data/document.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/document.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool xmlTest: false
     property bool dataOK: false
 
diff --git a/tests/auto/declarative/xmlhttprequest/data/domExceptionCodes.qml b/tests/auto/declarative/xmlhttprequest/data/domExceptionCodes.qml
index a4ab66c..de5ee4f 100644
--- a/tests/auto/declarative/xmlhttprequest/data/domExceptionCodes.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/domExceptionCodes.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property int index_size_err: DOMException.INDEX_SIZE_ERR
     property int domstring_size_err: DOMException.DOMSTRING_SIZE_ERR
     property int hierarchy_request_err: DOMException.HIERARCHY_REQUEST_ERR
diff --git a/tests/auto/declarative/xmlhttprequest/data/element.qml b/tests/auto/declarative/xmlhttprequest/data/element.qml
index 228db18..78c0374 100644
--- a/tests/auto/declarative/xmlhttprequest/data/element.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/element.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool xmlTest: false
     property bool dataOK: false
 
diff --git a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders.qml b/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders.qml
index 0bee7ad..02a8083 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
 
     property bool unsentException: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_args.qml b/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_args.qml
index c2cf898..37124c7 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_args.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_args.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool exceptionThrown: false
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_sent.qml b/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_sent.qml
index 9583f9d..505e4b1 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_sent.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_sent.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool test: false
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_unsent.qml b/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_unsent.qml
index fac5259..20fb040 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_unsent.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_unsent.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool test: false
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader.qml b/tests/auto/declarative/xmlhttprequest/data/getResponseHeader.qml
index 798b346..2f949e1 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/getResponseHeader.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
 
     property bool unsentException: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_args.qml b/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_args.qml
index ca7aed8..d5aa4b1 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_args.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_args.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool exceptionThrown: false
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_sent.qml b/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_sent.qml
index 148a19c..7538ffd 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_sent.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_sent.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool test: false
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_unsent.qml b/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_unsent.qml
index 5abdf0a..3b55802 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_unsent.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_unsent.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool test: false
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/xmlhttprequest/data/instanceStateValues.qml b/tests/auto/declarative/xmlhttprequest/data/instanceStateValues.qml
index ab3064f..b8d01c4 100644
--- a/tests/auto/declarative/xmlhttprequest/data/instanceStateValues.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/instanceStateValues.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property int unsent
     property int opened
     property int headers_received
diff --git a/tests/auto/declarative/xmlhttprequest/data/invalidMethodUsage.qml b/tests/auto/declarative/xmlhttprequest/data/invalidMethodUsage.qml
index 893eb8b..b30989b 100644
--- a/tests/auto/declarative/xmlhttprequest/data/invalidMethodUsage.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/invalidMethodUsage.qml
@@ -1,6 +1,6 @@
 import Qt 4.6 
 
-Object {
+QtObject {
     property bool onreadystatechange: false
     property bool readyState: false
     property bool status: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/open.qml b/tests/auto/declarative/xmlhttprequest/data/open.qml
index 7729bab..c06bae3 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/open.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
 
     property bool readyState: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/open_arg_count.1.qml b/tests/auto/declarative/xmlhttprequest/data/open_arg_count.1.qml
index 74f13ba..b6d4c32 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open_arg_count.1.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/open_arg_count.1.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool exceptionThrown: false
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/xmlhttprequest/data/open_arg_count.2.qml b/tests/auto/declarative/xmlhttprequest/data/open_arg_count.2.qml
index 35dce9f..8c86c20 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open_arg_count.2.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/open_arg_count.2.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool exceptionThrown: false
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/xmlhttprequest/data/open_invalid_method.qml b/tests/auto/declarative/xmlhttprequest/data/open_invalid_method.qml
index 7fb1a4c..69f79ae 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open_invalid_method.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/open_invalid_method.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool exceptionThrown: false
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/xmlhttprequest/data/open_sync.qml b/tests/auto/declarative/xmlhttprequest/data/open_sync.qml
index 7133e81..1477279 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open_sync.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/open_sync.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool exceptionThrown: false
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/xmlhttprequest/data/open_user.qml b/tests/auto/declarative/xmlhttprequest/data/open_user.qml
index cc90433..19e37fa 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open_user.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/open_user.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
 
     property bool readyState: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/open_username.qml b/tests/auto/declarative/xmlhttprequest/data/open_username.qml
index c38110c..983ea14 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open_username.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/open_username.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
 
     property bool readyState: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/responseText.qml b/tests/auto/declarative/xmlhttprequest/data/responseText.qml
index 0bb8659..4bb3a7a 100644
--- a/tests/auto/declarative/xmlhttprequest/data/responseText.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/responseText.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
     property string expectedText
 
diff --git a/tests/auto/declarative/xmlhttprequest/data/responseXML_invalid.qml b/tests/auto/declarative/xmlhttprequest/data/responseXML_invalid.qml
index 4fc4fe5..63f288e 100644
--- a/tests/auto/declarative/xmlhttprequest/data/responseXML_invalid.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/responseXML_invalid.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool xmlNull: false
     property bool dataOK: false
 
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_alreadySent.qml b/tests/auto/declarative/xmlhttprequest/data/send_alreadySent.qml
index 4598169..0bad7df 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_alreadySent.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/send_alreadySent.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool dataOK: false
     property bool test: false
 
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.1.qml b/tests/auto/declarative/xmlhttprequest/data/send_data.1.qml
index c0b5bf8..03543a9 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.1.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/send_data.1.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
 
     property bool dataOK: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.2.qml b/tests/auto/declarative/xmlhttprequest/data/send_data.2.qml
index 8a8c375..79a27b6 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.2.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/send_data.2.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
 
     property bool dataOK: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.3.qml b/tests/auto/declarative/xmlhttprequest/data/send_data.3.qml
index ae5731f..e048769 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.3.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/send_data.3.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
 
     property bool dataOK: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.4.qml b/tests/auto/declarative/xmlhttprequest/data/send_data.4.qml
index 4705007..7ab0b27 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.4.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/send_data.4.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
 
     property bool dataOK: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.5.qml b/tests/auto/declarative/xmlhttprequest/data/send_data.5.qml
index eca1676..29bf2c2 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.5.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/send_data.5.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
 
     property bool dataOK: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.6.qml b/tests/auto/declarative/xmlhttprequest/data/send_data.6.qml
index 0bc2e35..135f45c 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.6.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/send_data.6.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
 
     property bool dataOK: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.7.qml b/tests/auto/declarative/xmlhttprequest/data/send_data.7.qml
index 3a2ba56..4a09527 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.7.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/send_data.7.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
 
     property bool dataOK: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_ignoreData.qml b/tests/auto/declarative/xmlhttprequest/data/send_ignoreData.qml
index 6f33eef..dd5fa46 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_ignoreData.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/send_ignoreData.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string reqType
     property string url
 
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_unsent.qml b/tests/auto/declarative/xmlhttprequest/data/send_unsent.qml
index 76c26a3..7f51ecf 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_unsent.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/send_unsent.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool test: false
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader.qml b/tests/auto/declarative/xmlhttprequest/data/setRequestHeader.qml
index 8ea587a..b0723aa 100644
--- a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/setRequestHeader.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
 
     property bool dataOK: false
diff --git a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_args.qml b/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_args.qml
index 6824af2..8305ae1 100644
--- a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_args.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_args.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool exceptionThrown: false
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_illegalName.qml b/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_illegalName.qml
index 8029bc4..bf31eca 100644
--- a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_illegalName.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_illegalName.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
     property string header
 
diff --git a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_sent.qml b/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_sent.qml
index b637f17..c2bbc6e 100644
--- a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_sent.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_sent.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
     property bool test: false
 
diff --git a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_unsent.qml b/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_unsent.qml
index 4e89abf..30bc93e 100644
--- a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_unsent.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_unsent.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool test: false
 
     Component.onCompleted: {
diff --git a/tests/auto/declarative/xmlhttprequest/data/staticStateValues.qml b/tests/auto/declarative/xmlhttprequest/data/staticStateValues.qml
index aaaadad..ec1c5d8 100644
--- a/tests/auto/declarative/xmlhttprequest/data/staticStateValues.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/staticStateValues.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property int unsent: XMLHttpRequest.UNSENT
     property int opened: XMLHttpRequest.OPENED
     property int headers_received: XMLHttpRequest.HEADERS_RECEIVED
diff --git a/tests/auto/declarative/xmlhttprequest/data/status.qml b/tests/auto/declarative/xmlhttprequest/data/status.qml
index 7b2e8d0..04202c4 100644
--- a/tests/auto/declarative/xmlhttprequest/data/status.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/status.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
     property int expectedStatus
 
diff --git a/tests/auto/declarative/xmlhttprequest/data/statusText.qml b/tests/auto/declarative/xmlhttprequest/data/statusText.qml
index 00d8fdc..8becc3b 100644
--- a/tests/auto/declarative/xmlhttprequest/data/statusText.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/statusText.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property string url
     property string expectedStatus
 
diff --git a/tests/auto/declarative/xmlhttprequest/data/text.qml b/tests/auto/declarative/xmlhttprequest/data/text.qml
index 8c97504..4615a07 100644
--- a/tests/auto/declarative/xmlhttprequest/data/text.qml
+++ b/tests/auto/declarative/xmlhttprequest/data/text.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 
-Object {
+QtObject {
     property bool xmlTest: false
     property bool dataOK: false