summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmleasefollow.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-12-01 23:44:43 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-12-01 23:44:43 (GMT)
commitba661047f46ff6d6affb5f3ebad0b90a48d7982a (patch)
tree8bd4bea869a2d6ee576c52ea935673d6458b4ad0 /src/declarative/util/qmleasefollow.cpp
parent4b6c67881431cf34eee30319b81bad2030b94ff5 (diff)
parent17772ed96a126b48fda3dbaa945f705059681e06 (diff)
downloadQt-ba661047f46ff6d6affb5f3ebad0b90a48d7982a.zip
Qt-ba661047f46ff6d6affb5f3ebad0b90a48d7982a.tar.gz
Qt-ba661047f46ff6d6affb5f3ebad0b90a48d7982a.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmleasefollow.cpp')
-rw-r--r--src/declarative/util/qmleasefollow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qmleasefollow.cpp b/src/declarative/util/qmleasefollow.cpp
index 5e81117..60e48c8 100644
--- a/src/declarative/util/qmleasefollow.cpp
+++ b/src/declarative/util/qmleasefollow.cpp
@@ -124,7 +124,7 @@ bool QmlEaseFollowPrivate::recalc()
vp = velocity;
sp = 0;
sd = s;
- } else if (tf > (maximumEasingTime / 1000.)) {
+ } else if (maximumEasingTime != -1 && tf > (maximumEasingTime / 1000.)) {
qreal met = maximumEasingTime / 1000.;
td = tf - met;