diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-06 17:51:14 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-06 17:51:14 (GMT) |
| commit | 86eec3f6f98b387bf6a815c1a8e916965928b317 (patch) | |
| tree | eae5c5e72da6fe0c5939e6b730f1218db7c6372d /src/declarative/util/qdeclarativespringanimation.cpp | |
| parent | 9d15caa7f1103060f5fe1f8283e834ff51591a3f (diff) | |
| parent | c45516f1f3781dcb504158f730b98897c7f2f2a1 (diff) | |
| download | Qt-86eec3f6f98b387bf6a815c1a8e916965928b317.zip Qt-86eec3f6f98b387bf6a815c1a8e916965928b317.tar.gz Qt-86eec3f6f98b387bf6a815c1a8e916965928b317.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
src/declarative/util/qdeclarativeanimation.cpp
Diffstat (limited to 'src/declarative/util/qdeclarativespringanimation.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativespringanimation.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/declarative/util/qdeclarativespringanimation.cpp index cfc7b8e..6f4ac51 100644 --- a/src/declarative/util/qdeclarativespringanimation.cpp +++ b/src/declarative/util/qdeclarativespringanimation.cpp @@ -228,6 +228,7 @@ void QDeclarativeSpringAnimationPrivate::updateMode() /*! \qmlclass SpringAnimation QDeclarativeSpringAnimation + \inherits Animation \since 4.7 \brief The SpringAnimation element allows a property to track a value in a spring-like motion. @@ -246,7 +247,7 @@ void QDeclarativeSpringAnimationPrivate::updateMode() Like any other animation element, a SpringAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l PropertyAnimation documentation shows a variety of methods + sources. The \l {QML Animation} documentation shows a variety of methods for creating animations. \sa SmoothedAnimation, {QML Animation}, {declarative/animation/basics}{Animation basics example}, {declarative/toys/clocks}{Clocks example} |