diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-03-01 22:30:20 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-03-01 22:30:20 (GMT) |
| commit | 172df566d0ff512012afbc5039535e532868a1e5 (patch) | |
| tree | 41fd3526389bc3ff948c7628e99578c71fc79d9d /demos/declarative/minehunt/minehunt.qml | |
| parent | 32cdbb6de84eab0c3619d36f3091e68e93caf3e9 (diff) | |
| parent | 4f77d4f1bebba1627700037bdfce4e74ad84cce8 (diff) | |
| download | Qt-172df566d0ff512012afbc5039535e532868a1e5.zip Qt-172df566d0ff512012afbc5039535e532868a1e5.tar.gz Qt-172df566d0ff512012afbc5039535e532868a1e5.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'demos/declarative/minehunt/minehunt.qml')
| -rw-r--r-- | demos/declarative/minehunt/minehunt.qml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/demos/declarative/minehunt/minehunt.qml b/demos/declarative/minehunt/minehunt.qml index 617a6ed..8a3cab1 100644 --- a/demos/declarative/minehunt/minehunt.qml +++ b/demos/declarative/minehunt/minehunt.qml @@ -31,7 +31,7 @@ Item { anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter source: "pics/flag.png" - opacity: model.hasFlag + opacity: modelData.hasFlag opacity: Behavior { NumberAnimation { property: "opacity" @@ -47,16 +47,16 @@ Item { Text { anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter - text: model.hint + text: modelData.hint color: "white" font.bold: true - opacity: !model.hasMine && model.hint > 0 + opacity: !modelData.hasMine && modelData.hint > 0 } Image { anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter source: "pics/bomb.png" - opacity: model.hasMine + opacity: modelData.hasMine } Explosion { id: expl @@ -65,7 +65,7 @@ Item { states: [ State { name: "back" - when: model.flipped + when: modelData.flipped PropertyChanges { target: flipable; angle: 180 } } ] @@ -81,7 +81,7 @@ Item { else ret = 0; if (ret > 0) { - if (model.hasMine && model.flipped) { + if (modelData.hasMine && modelData.flipped) { ret*3; } else { ret; @@ -96,7 +96,7 @@ Item { properties: "angle" } ScriptAction{ - script: if(model.hasMine && model.flipped){expl.explode = true;} + script: if(modelData.hasMine && modelData.flipped){expl.explode = true;} } } } |