diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-02-03 12:26:37 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-07 05:32:47 +0100 |
| commit | ce3dee765c858a0b573d468ef8fee6b838e576d1 (patch) | |
| tree | b7026a061b0b58bac6af30eaab6e610c5ebeb504 /src/quick/util/qdeclarativesmoothedanimation_p.h | |
| parent | 0ca9d3f0f720e1933379ef40bc5c29253e21cba0 (diff) | |
Add and use new animation backend.
The new backend improves performance, and allows us to create
multiple running animation jobs from a single Transition. It is
based off of the existing Qt animation framework.
Change-Id: Id1d0162f6e5c65bf31267f3f9f2042c354375d57
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/quick/util/qdeclarativesmoothedanimation_p.h')
| -rw-r--r-- | src/quick/util/qdeclarativesmoothedanimation_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/quick/util/qdeclarativesmoothedanimation_p.h b/src/quick/util/qdeclarativesmoothedanimation_p.h index 02acf205d9..d065a20516 100644 --- a/src/quick/util/qdeclarativesmoothedanimation_p.h +++ b/src/quick/util/qdeclarativesmoothedanimation_p.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QDeclarativeProperty; class QDeclarativeSmoothedAnimationPrivate; -class Q_AUTOTEST_EXPORT QDeclarativeSmoothedAnimation : public QDeclarativeNumberAnimation +class Q_QUICK_PRIVATE_EXPORT QDeclarativeSmoothedAnimation : public QDeclarativeNumberAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeSmoothedAnimation) @@ -81,11 +81,9 @@ public: int maximumEasingTime() const; void setMaximumEasingTime(int); - virtual void transition(QDeclarativeStateActions &actions, + virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions, QDeclarativeProperties &modified, TransitionDirection direction); - QAbstractAnimation* qtAnimation(); - Q_SIGNALS: void velocityChanged(); void reversingModeChanged(); |