diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-02-03 00:01:13 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-02-03 00:04:03 (GMT) |
| commit | 17d0ed5af4922645a268b6550742fb521d459c8e (patch) | |
| tree | 43f4077630bd896da88715dec894392c63ac666b /demos/declarative | |
| parent | 35a211cd95e0d09ef0b547b57f01f0a9ff41da2f (diff) | |
| download | Qt-17d0ed5af4922645a268b6550742fb521d459c8e.zip Qt-17d0ed5af4922645a268b6550742fb521d459c8e.tar.gz Qt-17d0ed5af4922645a268b6550742fb521d459c8e.tar.bz2 | |
Disallow ids that start with uppercase letters and update docs and
examples accordingly.
Task-number: QT-2786
Diffstat (limited to 'demos/declarative')
| -rw-r--r-- | demos/declarative/calculator/CalcButton.qml | 12 | ||||
| -rw-r--r-- | demos/declarative/flickr/flickr-desktop.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/twitter/content/FatDelegate.qml | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/demos/declarative/calculator/CalcButton.qml b/demos/declarative/calculator/CalcButton.qml index 03ede9c..08851d0 100644 --- a/demos/declarative/calculator/CalcButton.qml +++ b/demos/declarative/calculator/CalcButton.qml @@ -9,8 +9,8 @@ Rectangle { id: button; width: 50; height: 30 border.color: palette.mid; radius: 6 gradient: Gradient { - GradientStop { id: G1; position: 0.0; color: Qt.lighter(palette.button) } - GradientStop { id: G2; position: 1.0; color: palette.button } + GradientStop { id: gradientStop1; position: 0.0; color: Qt.lighter(palette.button) } + GradientStop { id: gradientStop2; position: 1.0; color: palette.button } } Text { id: label; anchors.centerIn: parent; color: palette.buttonText } @@ -29,13 +29,13 @@ Rectangle { states: [ State { name: "Pressed"; when: clickRegion.pressed == true - PropertyChanges { target: G1; color: palette.dark } - PropertyChanges { target: G2; color: palette.button } + PropertyChanges { target: gradientStop1; color: palette.dark } + PropertyChanges { target: gradientStop2; color: palette.button } }, State { name: "Toggled"; when: button.toggled == true - PropertyChanges { target: G1; color: palette.dark } - PropertyChanges { target: G2; color: palette.button } + PropertyChanges { target: gradientStop1; color: palette.dark } + PropertyChanges { target: gradientStop2; color: palette.button } } ] } diff --git a/demos/declarative/flickr/flickr-desktop.qml b/demos/declarative/flickr/flickr-desktop.qml index 10babeb..4e3b6cb 100644 --- a/demos/declarative/flickr/flickr-desktop.qml +++ b/demos/declarative/flickr/flickr-desktop.qml @@ -57,7 +57,7 @@ Item { id: shadows Image { source: "common/pics/shadow-right.png"; x: whiteRect.width; height: whiteRect.height } Image { source: "common/pics/shadow-bottom.png"; y: whiteRect.height; width: whiteRect.width } - Image { id: Corner; source: "common/pics/shadow-corner.png"; x: whiteRect.width; y: whiteRect.height } + Image { id: corner; source: "common/pics/shadow-corner.png"; x: whiteRect.width; y: whiteRect.height } } } diff --git a/demos/declarative/twitter/content/FatDelegate.qml b/demos/declarative/twitter/content/FatDelegate.qml index 23b4838..2b9288b 100644 --- a/demos/declarative/twitter/content/FatDelegate.qml +++ b/demos/declarative/twitter/content/FatDelegate.qml @@ -1,7 +1,7 @@ import Qt 4.6 Component { - id: ListDelegate + id: listDelegate Item { id: wrapper; width: wrapper.ListView.view.width; height: if(txt.height > 58){txt.height+8}else{58}//50+4+4 Script { |