diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-25 06:06:38 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-25 06:06:38 (GMT) |
| commit | 3fc821d53e8a93f74b7e7c73bbe0a9930415e431 (patch) | |
| tree | cf8698e69e0074a0643f4e3f34df823d8be7b309 | |
| parent | 7c589d3584045f2f3eaac7d9eb36c5a17f8f2067 (diff) | |
| parent | d16d34a90d20e326a38b890e3665b3b8656ee414 (diff) | |
| download | Qt-3fc821d53e8a93f74b7e7c73bbe0a9930415e431.zip Qt-3fc821d53e8a93f74b7e7c73bbe0a9930415e431.tar.gz Qt-3fc821d53e8a93f74b7e7c73bbe0a9930415e431.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
| -rw-r--r-- | demos/declarative/snake/snake.qml | 4 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativeanimation_p_p.h | 3 |
2 files changed, 5 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; } diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h index bb81fb3..65c9807 100644 --- a/src/declarative/util/qdeclarativeanimation_p_p.h +++ b/src/declarative/util/qdeclarativeanimation_p_p.h @@ -165,6 +165,9 @@ public: protected: virtual void updateCurrentValue(const QVariant &value) { + if (state() == QAbstractAnimation::Stopped) + return; + if (animValue) animValue->setValue(value.toReal()); } |