diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-07-09 04:07:31 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-07-18 04:22:06 (GMT) |
| commit | 953eeb0eeebb27d440e002cf4c3620b87bbe43d5 (patch) | |
| tree | 99da6ffbb7376f60651ad6fd6be056237ddfd592 /src | |
| parent | 57dcaf349dbfd4494b15bb8465b277792eb739bb (diff) | |
| download | Qt-953eeb0eeebb27d440e002cf4c3620b87bbe43d5.zip Qt-953eeb0eeebb27d440e002cf4c3620b87bbe43d5.tar.gz Qt-953eeb0eeebb27d440e002cf4c3620b87bbe43d5.tar.bz2 | |
Make test pass and fix docs following removal of SpringFollow
(cherry picked from commit 31cd8c15c0fdb2f08c2652609a57413a715d1b13)
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/util/qdeclarativesmoothedanimation.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativespringanimation.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp index 6b6df4d..5d47c30 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation.cpp +++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp @@ -307,7 +307,7 @@ Rectangle { set to a value such as 0.5 units/second. Animating from 0 to 1.0 with a velocity of 0.5 will take 2000 ms to complete. - \sa SpringFollow, {QML Animation}, {declarative/animation/basics}{Animation basics example} + \sa {QML Animation}, {declarative/animation/basics}{Animation basics example} */ QDeclarativeSmoothedAnimation::QDeclarativeSmoothedAnimation(QObject *parent) diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/declarative/util/qdeclarativespringanimation.cpp index 314b82b..d7c0f90 100644 --- a/src/declarative/util/qdeclarativespringanimation.cpp +++ b/src/declarative/util/qdeclarativespringanimation.cpp @@ -232,7 +232,7 @@ qreal QDeclarativeSpringAnimation::to() const } /*! - \qmlproperty real SpringFollow::to + \qmlproperty real SpringAnimation::to */ void QDeclarativeSpringAnimation::setTo(qreal value) @@ -254,7 +254,7 @@ qreal QDeclarativeSpringAnimation::from() const } /*! - \qmlproperty real SpringFollow::from + \qmlproperty real SpringAnimation::from */ void QDeclarativeSpringAnimation::setFrom(qreal value) |