diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:25:02 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:25:02 +0100 |
| commit | ac46d0b14d7601412c28675ab2ff9fcd31e097be (patch) | |
| tree | 93dba8088abb7e634d65cf4c0bd90cb1b8793d47 /src/declarative/util | |
| parent | fca5998b637ce656306224706c1060d806193c48 (diff) | |
| parent | 8c683045f8933a8574a39e8222d29cb5bc5b243a (diff) | |
| download | qtquick1-ac46d0b14d7601412c28675ab2ff9fcd31e097be.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I39178ea637dc950cbbb631b725350ab99897ad45
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativesmoothedanimation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp index 1e68a7a1..240bc5d6 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation.cpp +++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp @@ -100,10 +100,10 @@ bool QSmoothedAnimation::recalc() s = (invert? qreal(-1.0): qreal(1.0)) * s; - if (userDuration > 0 && velocity > 0) { + if (userDuration >= 0 && velocity > 0) { tf = s / velocity; if (tf > (userDuration / qreal(1000.))) tf = (userDuration / qreal(1000.)); - } else if (userDuration > 0) { + } else if (userDuration >= 0) { tf = userDuration / qreal(1000.); } else if (velocity > 0) { tf = s / velocity; |