diff options
Diffstat (limited to 'tests/auto/declarative/states')
26 files changed, 89 insertions, 89 deletions
diff --git a/tests/auto/declarative/states/data/anchorChanges.qml b/tests/auto/declarative/states/data/anchorChanges.qml index 3d94f36..7dce889 100644 --- a/tests/auto/declarative/states/data/anchorChanges.qml +++ b/tests/auto/declarative/states/data/anchorChanges.qml @@ -1,7 +1,7 @@ import Qt 4.6 Rectangle { - id: Container + id: container width: 200; height: 200 Rectangle { id: myRect @@ -14,10 +14,10 @@ Rectangle { states: State { name: "right" AnchorChanges { - id: AncCh + id: ancCh target: myRect; reset: "left" - right: Container.right + right: container.right } } } diff --git a/tests/auto/declarative/states/data/anchorChanges2.qml b/tests/auto/declarative/states/data/anchorChanges2.qml index 2e13628..516ed58 100644 --- a/tests/auto/declarative/states/data/anchorChanges2.qml +++ b/tests/auto/declarative/states/data/anchorChanges2.qml @@ -3,8 +3,8 @@ import Qt 4.6 Rectangle { width: 200; height: 200 Rectangle { - id: MyRect - objectName: "MyRect" + id: myRect + objectName: "myRect" width: 50; height: 50 color: "green"; anchors.left: parent.left @@ -13,7 +13,7 @@ Rectangle { states: State { name: "right" AnchorChanges { - target: MyRect; + target: myRect; reset: "left" right: parent.right } diff --git a/tests/auto/declarative/states/data/anchorChanges3.qml b/tests/auto/declarative/states/data/anchorChanges3.qml index cf85472..e19bd9a 100644 --- a/tests/auto/declarative/states/data/anchorChanges3.qml +++ b/tests/auto/declarative/states/data/anchorChanges3.qml @@ -1,29 +1,29 @@ import Qt 4.6 Rectangle { - id: Container + id: container width: 200; height: 200 Rectangle { - id: MyRect - objectName: "MyRect" + id: myRect + objectName: "myRect" color: "green"; anchors.left: parent.left - anchors.right: RightGuideline.left - anchors.top: TopGuideline.top - anchors.bottom: Container.bottom + anchors.right: rightGuideline.left + anchors.top: topGuideline.top + anchors.bottom: container.bottom } - Item { objectName: "LeftGuideline"; id: LeftGuideline; x: 10 } - Item { id: RightGuideline; x: 150 } - Item { id: TopGuideline; y: 10 } - Item { objectName: "BottomGuideline"; id: BottomGuideline; y: 150 } + Item { objectName: "leftGuideline"; id: leftGuideline; x: 10 } + Item { id: rightGuideline; x: 150 } + Item { id: topGuideline; y: 10 } + Item { objectName: "bottomGuideline"; id: bottomGuideline; y: 150 } states: State { name: "reanchored" AnchorChanges { - target: MyRect; - left: LeftGuideline.left - right: Container.right - top: Container.top - bottom: BottomGuideline.bottom + target: myRect; + left: leftGuideline.left + right: container.right + top: container.top + bottom: bottomGuideline.bottom } } } diff --git a/tests/auto/declarative/states/data/anchorChanges4.qml b/tests/auto/declarative/states/data/anchorChanges4.qml index 717f506..b766c71 100644 --- a/tests/auto/declarative/states/data/anchorChanges4.qml +++ b/tests/auto/declarative/states/data/anchorChanges4.qml @@ -3,20 +3,20 @@ import Qt 4.6 Rectangle { width: 200; height: 200 Rectangle { - id: MyRect - objectName: "MyRect" + id: myRect + objectName: "myRect" color: "green"; anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter } - Item { objectName: "LeftGuideline"; id: LeftGuideline; x: 10 } - Item { objectName: "BottomGuideline"; id: BottomGuideline; y: 150 } + Item { objectName: "leftGuideline"; id: leftGuideline; x: 10 } + Item { objectName: "bottomGuideline"; id: bottomGuideline; y: 150 } states: State { name: "reanchored" AnchorChanges { - target: MyRect; - horizontalCenter: BottomGuideline.horizontalCenter - verticalCenter: LeftGuideline.verticalCenter + target: myRect; + horizontalCenter: bottomGuideline.horizontalCenter + verticalCenter: leftGuideline.verticalCenter } } } diff --git a/tests/auto/declarative/states/data/anchorChanges5.qml b/tests/auto/declarative/states/data/anchorChanges5.qml index ef5f041..2d4b3c0 100644 --- a/tests/auto/declarative/states/data/anchorChanges5.qml +++ b/tests/auto/declarative/states/data/anchorChanges5.qml @@ -3,20 +3,20 @@ import Qt 4.6 Rectangle { width: 200; height: 200 Rectangle { - id: MyRect - objectName: "MyRect" + id: myRect + objectName: "myRect" color: "green"; anchors.horizontalCenter: parent.horizontalCenter anchors.baseline: parent.baseline } - Item { objectName: "LeftGuideline"; id: LeftGuideline; x: 10 } - Item { objectName: "BottomGuideline"; id: BottomGuideline; y: 150 } + Item { objectName: "leftGuideline"; id: leftGuideline; x: 10 } + Item { objectName: "bottomGuideline"; id: bottomGuideline; y: 150 } states: State { name: "reanchored" AnchorChanges { - target: MyRect; - horizontalCenter: BottomGuideline.horizontalCenter - baseline: LeftGuideline.baseline + target: myRect; + horizontalCenter: bottomGuideline.horizontalCenter + baseline: leftGuideline.baseline } } } diff --git a/tests/auto/declarative/states/data/basicBinding.qml b/tests/auto/declarative/states/data/basicBinding.qml index 930a6b2..6528113 100644 --- a/tests/auto/declarative/states/data/basicBinding.qml +++ b/tests/auto/declarative/states/data/basicBinding.qml @@ -1,12 +1,12 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle property color sourceColor: "blue" width: 100; height: 100 color: "red" states: State { name: "blue" - PropertyChanges { target: MyRectangle; color: sourceColor } + PropertyChanges { target: myRectangle; color: sourceColor } } } diff --git a/tests/auto/declarative/states/data/basicBinding2.qml b/tests/auto/declarative/states/data/basicBinding2.qml index 6bfaf5a..2e7b4cf 100644 --- a/tests/auto/declarative/states/data/basicBinding2.qml +++ b/tests/auto/declarative/states/data/basicBinding2.qml @@ -1,12 +1,12 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle property color sourceColor: "red" width: 100; height: 100 color: sourceColor states: State { name: "blue" - PropertyChanges { target: MyRectangle; color: "blue" } + PropertyChanges { target: myRectangle; color: "blue" } } -}
\ No newline at end of file +} diff --git a/tests/auto/declarative/states/data/basicBinding3.qml b/tests/auto/declarative/states/data/basicBinding3.qml index 344bfae..a3c47d9 100644 --- a/tests/auto/declarative/states/data/basicBinding3.qml +++ b/tests/auto/declarative/states/data/basicBinding3.qml @@ -1,6 +1,6 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle property color sourceColor: "red" property color sourceColor2: "blue" @@ -8,6 +8,6 @@ Rectangle { color: sourceColor states: State { name: "blue" - PropertyChanges { target: MyRectangle; color: sourceColor2 } + PropertyChanges { target: myRectangle; color: sourceColor2 } } -}
\ No newline at end of file +} diff --git a/tests/auto/declarative/states/data/basicBinding4.qml b/tests/auto/declarative/states/data/basicBinding4.qml index f0b72bd..1f52d0e 100644 --- a/tests/auto/declarative/states/data/basicBinding4.qml +++ b/tests/auto/declarative/states/data/basicBinding4.qml @@ -1,6 +1,6 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle property color sourceColor: "blue" width: 100; height: 100 @@ -8,10 +8,10 @@ Rectangle { states: [ State { name: "blue" - PropertyChanges { target: MyRectangle; color: sourceColor } + PropertyChanges { target: myRectangle; color: sourceColor } }, State { name: "green" - PropertyChanges { target: MyRectangle; color: "green" } + PropertyChanges { target: myRectangle; color: "green" } }] } diff --git a/tests/auto/declarative/states/data/basicChanges.qml b/tests/auto/declarative/states/data/basicChanges.qml index 8d560c6..88ea256 100644 --- a/tests/auto/declarative/states/data/basicChanges.qml +++ b/tests/auto/declarative/states/data/basicChanges.qml @@ -1,10 +1,10 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle width: 100; height: 100 color: "red" states: State { name: "blue" - PropertyChanges { target: MyRectangle; color: "blue" } + PropertyChanges { target: myRectangle; color: "blue" } } -}
\ No newline at end of file +} diff --git a/tests/auto/declarative/states/data/basicChanges2.qml b/tests/auto/declarative/states/data/basicChanges2.qml index 0f8783a..4dd293f 100644 --- a/tests/auto/declarative/states/data/basicChanges2.qml +++ b/tests/auto/declarative/states/data/basicChanges2.qml @@ -1,15 +1,15 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle width: 100; height: 100 color: "red" states: [ State { name: "blue" - PropertyChanges { target: MyRectangle; color: "blue" } + PropertyChanges { target: myRectangle; color: "blue" } }, State { name: "green" - PropertyChanges { target: MyRectangle; color: "green" } + PropertyChanges { target: myRectangle; color: "green" } }] -}
\ No newline at end of file +} diff --git a/tests/auto/declarative/states/data/basicChanges3.qml b/tests/auto/declarative/states/data/basicChanges3.qml index 2a5ca5d..62ab1d5 100644 --- a/tests/auto/declarative/states/data/basicChanges3.qml +++ b/tests/auto/declarative/states/data/basicChanges3.qml @@ -1,15 +1,15 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle width: 100; height: 100 color: "red" states: [ State { name: "blue" - PropertyChanges { target: MyRectangle; color: "blue" } + PropertyChanges { target: myRectangle; color: "blue" } }, State { name: "bordered" - PropertyChanges { target: MyRectangle; border.width: 2 } + PropertyChanges { target: myRectangle; border.width: 2 } }] } diff --git a/tests/auto/declarative/states/data/basicExtension.qml b/tests/auto/declarative/states/data/basicExtension.qml index 230e00b..1836f8a 100644 --- a/tests/auto/declarative/states/data/basicExtension.qml +++ b/tests/auto/declarative/states/data/basicExtension.qml @@ -1,16 +1,16 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle width: 100; height: 100 color: "red" states: [ State { name: "blue" - PropertyChanges { target: MyRectangle; color: "blue" } + PropertyChanges { target: myRectangle; color: "blue" } }, State { name: "bordered" extend: "blue" - PropertyChanges { target: MyRectangle; border.width: 2 } + PropertyChanges { target: myRectangle; border.width: 2 } }] -}
\ No newline at end of file +} diff --git a/tests/auto/declarative/states/data/deleting.qml b/tests/auto/declarative/states/data/deleting.qml index 0c512dd..3da0b12 100644 --- a/tests/auto/declarative/states/data/deleting.qml +++ b/tests/auto/declarative/states/data/deleting.qml @@ -1,11 +1,11 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle width: 100; height: 100 color: "red" states: State { name: "blue" - PropertyChanges { target: MyRectangle; color: "blue"; objectName: "pc1" } - PropertyChanges { target: MyRectangle; radius: 5; objectName: "pc2" } + PropertyChanges { target: myRectangle; color: "blue"; objectName: "pc1" } + PropertyChanges { target: myRectangle; radius: 5; objectName: "pc2" } } } diff --git a/tests/auto/declarative/states/data/deletingState.qml b/tests/auto/declarative/states/data/deletingState.qml index 9dc46a6..a5e8ed3 100644 --- a/tests/auto/declarative/states/data/deletingState.qml +++ b/tests/auto/declarative/states/data/deletingState.qml @@ -1,13 +1,13 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle width: 100; height: 100 color: "red" StateGroup { id: stateGroup states: State { name: "blue" - PropertyChanges { target: MyRectangle; color: "blue" } + PropertyChanges { target: myRectangle; color: "blue" } } } } diff --git a/tests/auto/declarative/states/data/explicit.qml b/tests/auto/declarative/states/data/explicit.qml index ca7e274..7543f84 100644 --- a/tests/auto/declarative/states/data/explicit.qml +++ b/tests/auto/declarative/states/data/explicit.qml @@ -1,6 +1,6 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle property color sourceColor: "blue" width: 100; height: 100 color: "red" @@ -8,7 +8,7 @@ Rectangle { name: "blue" PropertyChanges { objectName: "changes" - target: MyRectangle; explicit: true + target: myRectangle; explicit: true color: sourceColor } } diff --git a/tests/auto/declarative/states/data/fakeExtension.qml b/tests/auto/declarative/states/data/fakeExtension.qml index 3d85c4f..c7975e1 100644 --- a/tests/auto/declarative/states/data/fakeExtension.qml +++ b/tests/auto/declarative/states/data/fakeExtension.qml @@ -1,16 +1,16 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle width: 100; height: 100 color: "red" states: [ State { name: "blue" - PropertyChanges { target: MyRectangle; color: "blue" } + PropertyChanges { target: myRectangle; color: "blue" } }, State { name: "green" extend: "blue" - PropertyChanges { target: MyRectangle; color: "green" } + PropertyChanges { target: myRectangle; color: "green" } }] -}
\ No newline at end of file +} diff --git a/tests/auto/declarative/states/data/nonExistantProp.qml b/tests/auto/declarative/states/data/nonExistantProp.qml index 582029d..a5dd86a 100644 --- a/tests/auto/declarative/states/data/nonExistantProp.qml +++ b/tests/auto/declarative/states/data/nonExistantProp.qml @@ -1,11 +1,11 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle width: 100; height: 100 color: "red" states: State { name: "blue" - PropertyChanges { target: MyRectangle; colr: "blue" } + PropertyChanges { target: myRectangle; colr: "blue" } } } diff --git a/tests/auto/declarative/states/data/parentChange.qml b/tests/auto/declarative/states/data/parentChange.qml index 29596a8..087da6b 100644 --- a/tests/auto/declarative/states/data/parentChange.qml +++ b/tests/auto/declarative/states/data/parentChange.qml @@ -13,7 +13,7 @@ Rectangle { } } MouseRegion { - id: Clickable + id: clickable anchors.fill: parent } @@ -28,7 +28,7 @@ Rectangle { states: State { name: "reparented" - when: Clickable.pressed + when: clickable.pressed ParentChange { target: myRect parent: newParent diff --git a/tests/auto/declarative/states/data/parentChange2.qml b/tests/auto/declarative/states/data/parentChange2.qml index d1c6d6a..f0b00f5 100644 --- a/tests/auto/declarative/states/data/parentChange2.qml +++ b/tests/auto/declarative/states/data/parentChange2.qml @@ -16,13 +16,13 @@ Rectangle { } } MouseRegion { - id: Clickable + id: clickable anchors.fill: parent } states: State { name: "reparented" - when: Clickable.pressed + when: clickable.pressed ParentChange { target: myRect parent: newParent diff --git a/tests/auto/declarative/states/data/parentChange3.qml b/tests/auto/declarative/states/data/parentChange3.qml index c7b7bee..2aa507c 100644 --- a/tests/auto/declarative/states/data/parentChange3.qml +++ b/tests/auto/declarative/states/data/parentChange3.qml @@ -17,7 +17,7 @@ Rectangle { } } MouseRegion { - id: Clickable + id: clickable anchors.fill: parent } @@ -33,7 +33,7 @@ Rectangle { states: State { name: "reparented" - when: Clickable.pressed + when: clickable.pressed ParentChange { target: myRect parent: newParent diff --git a/tests/auto/declarative/states/data/parentChange4.qml b/tests/auto/declarative/states/data/parentChange4.qml index ee75176..d00274b 100644 --- a/tests/auto/declarative/states/data/parentChange4.qml +++ b/tests/auto/declarative/states/data/parentChange4.qml @@ -10,7 +10,7 @@ Rectangle { color: "red" } MouseRegion { - id: Clickable + id: clickable anchors.fill: parent } @@ -21,7 +21,7 @@ Rectangle { states: State { name: "reparented" - when: Clickable.pressed + when: clickable.pressed ParentChange { target: myRect parent: newParent diff --git a/tests/auto/declarative/states/data/parentChange5.qml b/tests/auto/declarative/states/data/parentChange5.qml index 47b733b..f75e2a3 100644 --- a/tests/auto/declarative/states/data/parentChange5.qml +++ b/tests/auto/declarative/states/data/parentChange5.qml @@ -10,7 +10,7 @@ Rectangle { color: "red" } MouseRegion { - id: Clickable + id: clickable anchors.fill: parent } @@ -21,7 +21,7 @@ Rectangle { states: State { name: "reparented" - when: Clickable.pressed + when: clickable.pressed ParentChange { target: myRect parent: newParent diff --git a/tests/auto/declarative/states/data/propertyErrors.qml b/tests/auto/declarative/states/data/propertyErrors.qml index 270462e..080e833 100644 --- a/tests/auto/declarative/states/data/propertyErrors.qml +++ b/tests/auto/declarative/states/data/propertyErrors.qml @@ -1,10 +1,10 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle width: 100; height: 100 color: "red" states: State { name: "blue" - PropertyChanges { target: MyRectangle; colr: "blue"; wantsFocus: true } + PropertyChanges { target: myRectangle; colr: "blue"; wantsFocus: true } } } diff --git a/tests/auto/declarative/states/data/restoreEntryValues.qml b/tests/auto/declarative/states/data/restoreEntryValues.qml index d86f033..088c608 100644 --- a/tests/auto/declarative/states/data/restoreEntryValues.qml +++ b/tests/auto/declarative/states/data/restoreEntryValues.qml @@ -1,12 +1,12 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle width: 100; height: 100 color: "red" states: State { name: "blue" PropertyChanges { - target: MyRectangle + target: myRectangle restoreEntryValues: false color: "blue" } diff --git a/tests/auto/declarative/states/data/script.qml b/tests/auto/declarative/states/data/script.qml index 6983419..3c5f33e 100644 --- a/tests/auto/declarative/states/data/script.qml +++ b/tests/auto/declarative/states/data/script.qml @@ -1,10 +1,10 @@ import Qt 4.6 Rectangle { - id: MyRectangle + id: myRectangle width: 100; height: 100 color: "red" states: State { name: "blue" - StateChangeScript { script: MyRectangle.color = "blue"; } + StateChangeScript { script: myRectangle.color = "blue"; } } } |