summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorThomas Kristensen <thkriste@cisco.com>2013-03-13 13:53:06 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-26 19:42:13 +0100
commit3eb583f6e6e0075583aea7dbf46cf3cec48cb879 (patch)
treec15f8bb78e0e69eab0b5f6df2a823661b99c32c4 /src/declarative
parent983d006ddf09b2ee81ae7aca599e899ca3239858 (diff)
Fix a bug where completed was emitted twice when duration was zero.v5.1.0-alpha1
Change-Id: I72c16f3affb297985e9e5d2e9f524537212d06ad Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/util/qdeclarativeanimation.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 83bfa170..a72df77a 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -160,10 +160,6 @@ void QDeclarativeAbstractAnimationPrivate::commence()
q->transition(actions, properties, QDeclarativeAbstractAnimation::Forward);
q->qtAnimation()->start();
- if (q->qtAnimation()->state() != QAbstractAnimation::Running) {
- running = false;
- emit q->completed();
- }
}
QDeclarativeProperty QDeclarativeAbstractAnimationPrivate::createProperty(QObject *obj, const QString &str, QObject *infoObj)