diff options
Diffstat (limited to 'tests/auto/declarative/qmlecmascript')
11 files changed, 19 insertions, 19 deletions
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 |