diff options
| author | Michael Brasser <michael.brasser@jollamobile.com> | 2014-02-12 23:31:22 -0600 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-20 04:27:15 +0100 |
| commit | 7da483bfbefcaabb1dbbf3e2f1d5b5f7aadc3b06 (patch) | |
| tree | 30a6bdb4cf3d7275c3acf8ffcfaa5aae0b594819 /src/quick/util/qquicksmoothedanimation_p_p.h | |
| parent | 587444f033cf51251f36321321ae358d187f37f9 (diff) | |
Make SmoothedAnimation and SpringAnimation smoothly transition again.
Fix regression introduced in Qt 5.0 when animation backend was
rewritten.
Task-number: QTBUG-36709
Change-Id: Ib8caa4bc6a38e3bb4c1d1d3961f775fdd2b342c7
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'src/quick/util/qquicksmoothedanimation_p_p.h')
| -rw-r--r-- | src/quick/util/qquicksmoothedanimation_p_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/util/qquicksmoothedanimation_p_p.h b/src/quick/util/qquicksmoothedanimation_p_p.h index 4391ea81ac..7835d0328b 100644 --- a/src/quick/util/qquicksmoothedanimation_p_p.h +++ b/src/quick/util/qquicksmoothedanimation_p_p.h @@ -58,8 +58,6 @@ #include "qquickanimation_p_p.h" -#include "private/qparallelanimationgroupjob_p.h" - #include <private/qobject_p.h> #include <QBasicTimer> @@ -129,7 +127,7 @@ private: qreal s; // Total s int lastTime; - bool useDelta; + bool skipUpdate; bool recalc(); void delayedStop(); |