diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-08-01 10:43:54 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-01 03:01:13 +0200 |
| commit | 9bc7e70c00736678d1430190566d2575c2ec764a (patch) | |
| tree | 0d0239a7054403682ab5311f78553c309f592587 /src/qtquick1/util | |
| parent | d410ad364ec0b8877797145c68a4d7c3c98ce1c0 (diff) | |
Correctly pause animation when paused in starting ScriptAction.
Task-number: QTBUG-13598
Change-Id: Ibd54f4e014eff301b57451081b7f7b35d1bed740
Reviewed-on: http://codereview.qt.nokia.com/2408
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/qtquick1/util')
| -rw-r--r-- | src/qtquick1/util/qdeclarativeanimation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qtquick1/util/qdeclarativeanimation.cpp b/src/qtquick1/util/qdeclarativeanimation.cpp index 46c3f15a29..89b768b827 100644 --- a/src/qtquick1/util/qdeclarativeanimation.cpp +++ b/src/qtquick1/util/qdeclarativeanimation.cpp @@ -162,7 +162,7 @@ void QDeclarative1AbstractAnimationPrivate::commence() q->transition(actions, properties, QDeclarative1AbstractAnimation::Forward); q->qtAnimation()->start(); - if (q->qtAnimation()->state() != QAbstractAnimation::Running) { + if (q->qtAnimation()->state() == QAbstractAnimation::Stopped) { running = false; emit q->completed(); } |