diff options
Diffstat (limited to 'tests/auto/declarative/qmllanguage')
17 files changed, 34 insertions, 34 deletions
diff --git a/tests/auto/declarative/qmllanguage/data/Alias.qml b/tests/auto/declarative/qmllanguage/data/Alias.qml index af6187a..55aa231 100644 --- a/tests/auto/declarative/qmllanguage/data/Alias.qml +++ b/tests/auto/declarative/qmllanguage/data/Alias.qml @@ -1,8 +1,8 @@ import Qt 4.6 QtObject { - id: Root + id: root property int value: 1892 - property alias aliasValue: Root.value + property alias aliasValue: root.value } diff --git a/tests/auto/declarative/qmllanguage/data/alias.1.qml b/tests/auto/declarative/qmllanguage/data/alias.1.qml index 3ad8f38..500b0f6 100644 --- a/tests/auto/declarative/qmllanguage/data/alias.1.qml +++ b/tests/auto/declarative/qmllanguage/data/alias.1.qml @@ -2,7 +2,7 @@ import Test 1.0 import Qt 4.6 QtObject { - id: Root + id: root property int value: 10 - property alias valueAlias: Root.value + property alias valueAlias: root.value } diff --git a/tests/auto/declarative/qmllanguage/data/alias.2.qml b/tests/auto/declarative/qmllanguage/data/alias.2.qml index aa4d103..5c92270 100644 --- a/tests/auto/declarative/qmllanguage/data/alias.2.qml +++ b/tests/auto/declarative/qmllanguage/data/alias.2.qml @@ -1,8 +1,8 @@ import Test 1.0 MyQmlObject { - id: Root - property alias aliasObject: Root.qmlobjectProperty + id: root + property alias aliasObject: root.qmlobjectProperty qmlobjectProperty: MyQmlObject { value : 10 } } diff --git a/tests/auto/declarative/qmllanguage/data/alias.3.qml b/tests/auto/declarative/qmllanguage/data/alias.3.qml index fa8a253..e059937 100644 --- a/tests/auto/declarative/qmllanguage/data/alias.3.qml +++ b/tests/auto/declarative/qmllanguage/data/alias.3.qml @@ -2,9 +2,9 @@ import Qt 4.6 QtObject { property var other - other: Alias { id: MyAliasObject } + other: Alias { id: myAliasObject } - property alias value: MyAliasObject.aliasValue - property alias value2: MyAliasObject.value + property alias value: myAliasObject.aliasValue + property alias value2: myAliasObject.value } diff --git a/tests/auto/declarative/qmllanguage/data/alias.8.qml b/tests/auto/declarative/qmllanguage/data/alias.8.qml index 38dc10f..2b9ad85 100644 --- a/tests/auto/declarative/qmllanguage/data/alias.8.qml +++ b/tests/auto/declarative/qmllanguage/data/alias.8.qml @@ -2,8 +2,8 @@ import Qt 4.6 QtObject { property var other - other: Alias3 { id: MyAliasObject } + other: Alias3 { id: myAliasObject } - property int value: MyAliasObject.obj.myValue + property int value: myAliasObject.obj.myValue } diff --git a/tests/auto/declarative/qmllanguage/data/alias.9.qml b/tests/auto/declarative/qmllanguage/data/alias.9.qml index 8061f99..a2a41a1 100644 --- a/tests/auto/declarative/qmllanguage/data/alias.9.qml +++ b/tests/auto/declarative/qmllanguage/data/alias.9.qml @@ -2,8 +2,8 @@ import Qt 4.6 QtObject { property var other - other: Alias4 { id: MyAliasObject } + other: Alias4 { id: myAliasObject } - property int value: MyAliasObject.obj.myValue + property int value: myAliasObject.obj.myValue } diff --git a/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.qml b/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.qml index e607768..00cc0c4 100644 --- a/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.qml +++ b/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.qml @@ -1,5 +1,5 @@ import Qt 4.6 ListModel { ListElement { a: 10 } - ListElement { id: Foo; a: 12 } + ListElement { id: foo; a: 12 } } diff --git a/tests/auto/declarative/qmllanguage/data/duplicateIDs.qml b/tests/auto/declarative/qmllanguage/data/duplicateIDs.qml index 9605b5b..a993abd 100644 --- a/tests/auto/declarative/qmllanguage/data/duplicateIDs.qml +++ b/tests/auto/declarative/qmllanguage/data/duplicateIDs.qml @@ -1,6 +1,6 @@ import Test 1.0 MyContainer { - MyQmlObject { id: MyID } - MyQmlObject { id: MyID } + MyQmlObject { id: myID } + MyQmlObject { id: myID } } diff --git a/tests/auto/declarative/qmllanguage/data/idProperty.qml b/tests/auto/declarative/qmllanguage/data/idProperty.qml index a413c0b..90c1483 100644 --- a/tests/auto/declarative/qmllanguage/data/idProperty.qml +++ b/tests/auto/declarative/qmllanguage/data/idProperty.qml @@ -1,8 +1,8 @@ import Test 1.0 MyContainer { - property var object : MyObjectId + property var object : myObjectId MyTypeObject { - id: "MyObjectId" + id: "myObjectId" } } diff --git a/tests/auto/declarative/qmllanguage/data/inlineQmlComponents.qml b/tests/auto/declarative/qmllanguage/data/inlineQmlComponents.qml index 79ceda6..478f06a 100644 --- a/tests/auto/declarative/qmllanguage/data/inlineQmlComponents.qml +++ b/tests/auto/declarative/qmllanguage/data/inlineQmlComponents.qml @@ -2,7 +2,7 @@ import Test 1.0 import Qt 4.6 MyContainer { Component { - id: MyComponent + id: myComponent MyQmlObject { value: 11 } diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.4.qml b/tests/auto/declarative/qmllanguage/data/invalidID.4.qml index 1f15fce..86010bf 100644 --- a/tests/auto/declarative/qmllanguage/data/invalidID.4.qml +++ b/tests/auto/declarative/qmllanguage/data/invalidID.4.qml @@ -1,6 +1,6 @@ import Test 1.0 MyQmlObject { - id: Hello - id: World + id: hello + id: world } diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.5.qml b/tests/auto/declarative/qmllanguage/data/invalidID.5.qml index 0545b0d..5b92a1a 100644 --- a/tests/auto/declarative/qmllanguage/data/invalidID.5.qml +++ b/tests/auto/declarative/qmllanguage/data/invalidID.5.qml @@ -1,6 +1,6 @@ import Test 1.0 -import Test 1.0 as Hello +import Test 1.0 as hello MyQmlObject { - id: Hello + id: hello } diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.6.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidID.6.errors.txt index 861e3d7..160e8b5 100644 --- a/tests/auto/declarative/qmllanguage/data/invalidID.6.errors.txt +++ b/tests/auto/declarative/qmllanguage/data/invalidID.6.errors.txt @@ -1 +1 @@ -3:9:id conflicts with type name +3:5:"StartsWithUpperCase" is not a valid object id diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.6.qml b/tests/auto/declarative/qmllanguage/data/invalidID.6.qml index ea34007..62187d9 100644 --- a/tests/auto/declarative/qmllanguage/data/invalidID.6.qml +++ b/tests/auto/declarative/qmllanguage/data/invalidID.6.qml @@ -1,5 +1,5 @@ import Test 1.0 MyQmlObject { - id: MyQmlObject + id: StartsWithUpperCase } diff --git a/tests/auto/declarative/qmllanguage/data/listItemDeleteSelf.qml b/tests/auto/declarative/qmllanguage/data/listItemDeleteSelf.qml index fa2e831..779c6d4 100644 --- a/tests/auto/declarative/qmllanguage/data/listItemDeleteSelf.qml +++ b/tests/auto/declarative/qmllanguage/data/listItemDeleteSelf.qml @@ -2,7 +2,7 @@ import Qt 4.6 Item { ListModel { - id: FruitModel + id: fruitModel ListElement { name: "Apple" cost: 2.45 @@ -18,21 +18,21 @@ Item { } Component { - id: FruitDelegate + id: fruitDelegate Item { width: 200; height: 50 Text { text: name } Text { text: '$'+cost; anchors.right: parent.right } MouseRegion { anchors.fill: parent - onClicked: FruitModel.remove(index) + onClicked: fruitModel.remove(index) } } } ListView { - model: FruitModel - delegate: FruitDelegate + model: fruitModel + delegate: fruitDelegate anchors.fill: parent } } diff --git a/tests/auto/declarative/qmllanguage/data/simpleBindings.qml b/tests/auto/declarative/qmllanguage/data/simpleBindings.qml index 74867b3..2fcd1a5 100644 --- a/tests/auto/declarative/qmllanguage/data/simpleBindings.qml +++ b/tests/auto/declarative/qmllanguage/data/simpleBindings.qml @@ -1,6 +1,6 @@ import Test 1.0 MyTypeObject { - id: Me + id: me property int v1: 10 property int v2: 11 @@ -10,9 +10,9 @@ MyTypeObject { property int value4 value1: v1 - value2: Me.v1 + value2: me.v1 value3: v1 + v2 value4: Math.min(v1, v2) - objectProperty: Me + objectProperty: me } diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp index 0a636db..d37c7b4 100644 --- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp +++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp @@ -528,7 +528,7 @@ void tst_qmllanguage::idProperty() MyTypeObject *child = qobject_cast<MyTypeObject *>(object->children()->at(0)); QVERIFY(child != 0); - QCOMPARE(child->id(), QString("MyObjectId")); + QCOMPARE(child->id(), QString("myObjectId")); QCOMPARE(object->property("object"), QVariant::fromValue((QObject *)child)); } |