diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-09 05:36:49 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-09 05:36:49 (GMT) |
commit | 74a248462ef36f7784fd0816ee08030412459930 (patch) | |
tree | ab41c0313467be480446397a8fe5463abee83035 /src/declarative/util/qdeclarativesmoothedanimation.cpp | |
parent | 49b828102626ba6faa38ea48d9f570283dd7fa9f (diff) | |
parent | 31cd8c15c0fdb2f08c2652609a57413a715d1b13 (diff) | |
download | Qt-74a248462ef36f7784fd0816ee08030412459930.zip Qt-74a248462ef36f7784fd0816ee08030412459930.tar.gz Qt-74a248462ef36f7784fd0816ee08030412459930.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativesmoothedanimation.cpp')
-rw-r--r-- | src/declarative/util/qdeclarativesmoothedanimation.cpp | 2 |
1 files changed, 1 insertions, 1 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) |