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/qdeclarativespringanimation_p.h | |
| 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/qdeclarativespringanimation_p.h')
| -rw-r--r-- | src/quick/util/qdeclarativespringanimation_p.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/quick/util/qdeclarativespringanimation_p.h b/src/quick/util/qdeclarativespringanimation_p.h index 13e983b9a5..fe9fa0a1ed 100644 --- a/src/quick/util/qdeclarativespringanimation_p.h +++ b/src/quick/util/qdeclarativespringanimation_p.h @@ -52,7 +52,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QDeclarativeSpringAnimationPrivate; -class Q_AUTOTEST_EXPORT QDeclarativeSpringAnimation : public QDeclarativeNumberAnimation +class Q_QUICK_PRIVATE_EXPORT QDeclarativeSpringAnimation : public QDeclarativeNumberAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeSpringAnimation) @@ -87,13 +87,10 @@ public: qreal modulus() const; void setModulus(qreal modulus); - virtual void transition(QDeclarativeStateActions &actions, + virtual QAbstractAnimation2Pointer transition(QDeclarativeStateActions &actions, QDeclarativeProperties &modified, TransitionDirection direction); -protected: - virtual QAbstractAnimation *qtAnimation(); - Q_SIGNALS: void modulusChanged(); void massChanged(); |