diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-02-25 06:25:07 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-02-25 06:25:07 (GMT) |
| commit | 5c82031a7357f4f3d100be30c0bfe4e878712829 (patch) | |
| tree | 77a806156f50ee1aa1f41c9f02432134f1fc0aac /demos/declarative/snake/snake.qml | |
| parent | 4c5292a36360821a3ba4a7bc4532688dff7b7ae9 (diff) | |
| parent | c58554711e678421cd70f103ad78506b3e1f8d85 (diff) | |
| download | Qt-5c82031a7357f4f3d100be30c0bfe4e878712829.zip Qt-5c82031a7357f4f3d100be30c0bfe4e878712829.tar.gz Qt-5c82031a7357f4f3d100be30c0bfe4e878712829.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'demos/declarative/snake/snake.qml')
| -rw-r--r-- | demos/declarative/snake/snake.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml index 3bec747..09b6b7f 100644 --- a/demos/declarative/snake/snake.qml +++ b/demos/declarative/snake/snake.qml @@ -172,14 +172,14 @@ Rectangle { states: [ State { name: "starting" - when: startHeartbeatTimer.running; + when: startHeartbeatTimer.running PropertyChanges {target: progressIndicator; width: 200} PropertyChanges {target: title; opacity: 0} PropertyChanges {target: progressBar; opacity: 1} }, State { name: "running" - when: heartbeat.running + when: (heartbeat.running && !startHeartbeatTimer.running) PropertyChanges {target: progressIndicator; width: 200} PropertyChanges {target: title; opacity: 0} PropertyChanges {target: skull; row: 0; column: 0; } |