diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-07-16 06:33:06 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-07-16 06:33:06 (GMT) |
| commit | 402ffa151d56a7af851d38a83bc37959c133cf94 (patch) | |
| tree | 46763e4881ae43ffa21201c3dc4013a9cdbeafd1 /src | |
| parent | 6d5d19b5d92868ed1cd53ea9e6bf8b1119d0da10 (diff) | |
| parent | 875ae40157aa9a34e0b74941fa905f7445c365df (diff) | |
| download | Qt-402ffa151d56a7af851d38a83bc37959c133cf94.zip Qt-402ffa151d56a7af851d38a83bc37959c133cf94.tar.gz Qt-402ffa151d56a7af851d38a83bc37959c133cf94.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/util/qdeclarativeanimation.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index bdb9510..5005746 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -1671,6 +1671,9 @@ void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int different. For more information see the individual property documentation, as well as the \l{QML Animation} introduction. + Note that PropertyAnimation inherits the abstract \l Animation element. + This includes additional properties and methods for controlling the animation. + \sa {QML Animation}, {declarative/animation/basics}{Animation basics example} */ |