diff options
| author | Martin Smith <martin.smith@nokia.com> | 2011-03-01 12:44:24 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2011-03-01 12:44:24 (GMT) |
| commit | c8c11c9eb265b5050e530279c13252de9a9971d3 (patch) | |
| tree | b556900c57827a48a2b5bb632a5b4bd6a9ca25e0 /src/declarative | |
| parent | bc47cf8e2de94fae6b7c3971529a2088d0806701 (diff) | |
| parent | 3dbb501a2a13786142c3b16ef4b50c101285e619 (diff) | |
| download | Qt-c8c11c9eb265b5050e530279c13252de9a9971d3.zip Qt-c8c11c9eb265b5050e530279c13252de9a9971d3.tar.gz Qt-c8c11c9eb265b5050e530279c13252de9a9971d3.tar.bz2 | |
Merge branch 'mimir' into 4.7
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/util/qdeclarativeanimation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index dd06e4a..9b8fcad 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -554,7 +554,7 @@ void QDeclarativeAbstractAnimation::timelineComplete() /*! \qmlclass PauseAnimation QDeclarativePauseAnimation - \ingroup qml-animation-transition + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The PauseAnimation element provides a pause for an animation. |