diff options
| author | Charles Yin <charles.yin@nokia.com> | 2011-12-05 16:29:23 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2011-12-06 01:45:56 +0100 |
| commit | b3c437d09514a254b1baaa6c6f9148fbf5e5e54c (patch) | |
| tree | 9718881481bf9fed8f1d3458e7fbee0e0aaaafd6 /src/quick/util/qdeclarativesmoothedanimation.cpp | |
| parent | 194ef2a13cb8161756e80c6085e6e474db62a483 (diff) | |
Fix build errors after moving qtquick2 to seperate plugin
Change-Id: I519b6d5219513eb09c578fd0e904ce92e49cf690
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/util/qdeclarativesmoothedanimation.cpp')
| -rw-r--r-- | src/quick/util/qdeclarativesmoothedanimation.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/quick/util/qdeclarativesmoothedanimation.cpp b/src/quick/util/qdeclarativesmoothedanimation.cpp index 13cf16bb25..4c6910a079 100644 --- a/src/quick/util/qdeclarativesmoothedanimation.cpp +++ b/src/quick/util/qdeclarativesmoothedanimation.cpp @@ -71,12 +71,11 @@ QSmoothedAnimationTimer::~QSmoothedAnimationTimer() void QSmoothedAnimationTimer::stopAnimation() { - m_animation->setAnimation(0); m_animation->stop(); } -QSmoothedAnimation::QSmoothedAnimation(QDeclarativeAbstractAnimation *animation) - : QAbstractAnimation2(animation), to(0), velocity(200), userDuration(-1), maximumEasingTime(-1), +QSmoothedAnimation::QSmoothedAnimation() + : QAbstractAnimation2(), to(0), velocity(200), userDuration(-1), maximumEasingTime(-1), reversingMode(QDeclarativeSmoothedAnimation::Eased), initialVelocity(0), trackVelocity(0), initialValue(0), invert(false), finalDuration(-1), lastTime(0), delayedStopTimer(new QSmoothedAnimationTimer(this)) |