summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-07-09 04:07:31 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-07-09 04:07:31 (GMT)
commit31cd8c15c0fdb2f08c2652609a57413a715d1b13 (patch)
treec87e32055b09a02b99be539e62307185cf1dd02b /src
parent389f4b225eb69e10e946c28dfcddbff067cf0364 (diff)
downloadQt-31cd8c15c0fdb2f08c2652609a57413a715d1b13.zip
Qt-31cd8c15c0fdb2f08c2652609a57413a715d1b13.tar.gz
Qt-31cd8c15c0fdb2f08c2652609a57413a715d1b13.tar.bz2
Make test pass and fix docs following removal of SpringFollow
Diffstat (limited to 'src')
-rw-r--r--src/declarative/util/qdeclarativesmoothedanimation.cpp2
-rw-r--r--src/declarative/util/qdeclarativespringanimation.cpp4
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 c098798..4cf2fc0 100644
--- a/src/declarative/util/qdeclarativespringanimation.cpp
+++ b/src/declarative/util/qdeclarativespringanimation.cpp
@@ -243,7 +243,7 @@ qreal QDeclarativeSpringAnimation::to() const
}
/*!
- \qmlproperty real SpringFollow::to
+ \qmlproperty real SpringAnimation::to
*/
void QDeclarativeSpringAnimation::setTo(qreal value)
@@ -265,7 +265,7 @@ qreal QDeclarativeSpringAnimation::from() const
}
/*!
- \qmlproperty real SpringFollow::from
+ \qmlproperty real SpringAnimation::from
*/
void QDeclarativeSpringAnimation::setFrom(qreal value)