Rename QML Object to QtObject

15 files changed, 20 insertions, 20 deletions

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