Rename QML Object to QtObject

61 files changed, 86 insertions, 85 deletions

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)
 }