summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlspringfollow.cpp
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2009-10-28 05:55:59 (GMT)
committerBea Lam <bea.lam@nokia.com>2009-10-28 05:55:59 (GMT)
commit55a3fcd7b2fe9cd43f3c0c20d75aaef056a05c5b (patch)
treea659b792178e6ee620f3d4c4218e518e4b158f64 /src/declarative/util/qmlspringfollow.cpp
parentf0f2941d6dccd4bd402861c01797bb210c516962 (diff)
parent44be8cc3bb1aebd47f75dcf9cae54884322e1955 (diff)
downloadQt-55a3fcd7b2fe9cd43f3c0c20d75aaef056a05c5b.zip
Qt-55a3fcd7b2fe9cd43f3c0c20d75aaef056a05c5b.tar.gz
Qt-55a3fcd7b2fe9cd43f3c0c20d75aaef056a05c5b.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlspringfollow.cpp')
-rw-r--r--src/declarative/util/qmlspringfollow.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/declarative/util/qmlspringfollow.cpp b/src/declarative/util/qmlspringfollow.cpp
index 34ec976..569cc48 100644
--- a/src/declarative/util/qmlspringfollow.cpp
+++ b/src/declarative/util/qmlspringfollow.cpp
@@ -272,10 +272,11 @@ qreal QmlSpringFollow::sourceValue() const
void QmlSpringFollow::setSourceValue(qreal value)
{
Q_D(QmlSpringFollow);
- if (d->sourceValue != value) {
- d->sourceValue = value;
- d->start();
- }
+ if (d->clock.state() == QAbstractAnimation::Running && d->sourceValue == value)
+ return;
+
+ d->sourceValue = value;
+ d->start();
}
/*!