diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-09-07 03:14:13 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-09-07 03:14:13 (GMT) |
| commit | 263e1f2f68f7403be29d6097315d6caa31ebe477 (patch) | |
| tree | e4f8fb20292769ed4c2067422a7bf18ffde05b87 /demos | |
| parent | 9008c7002ffe6617ffcd602a7a9923e83e8b8f80 (diff) | |
| parent | 6ead3fa2b5b88844fb85137a7e11708084e63cbf (diff) | |
| download | Qt-263e1f2f68f7403be29d6097315d6caa31ebe477.zip Qt-263e1f2f68f7403be29d6097315d6caa31ebe477.tar.gz Qt-263e1f2f68f7403be29d6097315d6caa31ebe477.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/calculator/CalcButton.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/declarative/calculator/CalcButton.qml b/demos/declarative/calculator/CalcButton.qml index 0fb5412..966c8e4 100644 --- a/demos/declarative/calculator/CalcButton.qml +++ b/demos/declarative/calculator/CalcButton.qml @@ -16,7 +16,7 @@ Rectangle { Text { anchors.centerIn: parent; text: operation; color: Palette.buttonText } MouseRegion { - id: MouseRegion + id: ClickRegion anchors.fill: parent onClicked: { doOp(operation); @@ -28,7 +28,7 @@ Rectangle { states: [ State { - name: "Pressed"; when: MouseRegion.pressed == true + name: "Pressed"; when: ClickRegion.pressed == true PropertyChanges { target: G1; color: Palette.dark } PropertyChanges { target: G2; color: Palette.button } }, |