diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 05:03:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 05:03:07 (GMT) |
| commit | 29a6377c6539840ca901bdcb045a42b7832ac98a (patch) | |
| tree | a4eace12b0263723f5c76ca660a1747f8b5e3a28 /src/declarative/util/qdeclarativetransition.cpp | |
| parent | 5929062996c9d0d90f19198064953a0086be7741 (diff) | |
| parent | 6c7ed006b0a1f006e11fd5f78dd996d65114fc98 (diff) | |
| download | Qt-29a6377c6539840ca901bdcb045a42b7832ac98a.zip Qt-29a6377c6539840ca901bdcb045a42b7832ac98a.tar.gz Qt-29a6377c6539840ca901bdcb045a42b7832ac98a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Document that animations have to be started/stopped as a group
various doc fixes
Document 'this' as undefined in QML
Diffstat (limited to 'src/declarative/util/qdeclarativetransition.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativetransition.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp index 6561b8c..582191b 100644 --- a/src/declarative/util/qdeclarativetransition.cpp +++ b/src/declarative/util/qdeclarativetransition.cpp @@ -66,13 +66,13 @@ QT_BEGIN_NAMESPACE \snippet doc/src/snippets/declarative/transition.qml 0 - To specify multiple transitions, specify \l Item::transitions as a list: + To define multiple transitions, specify \l Item::transitions as a list: \qml Item { ... transitions: [ - Transition { ... } + Transition { ... }, Transition { ... } ] } |