diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-05 03:13:40 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-05 03:13:40 (GMT) |
| commit | fde6b4cc1e720ae655ccac9d7f83c7d2dc4badc4 (patch) | |
| tree | b16e2cfd90d7e996f79f7e3020a4c4ae7b44c970 /src/declarative/util/qdeclarativetransition.cpp | |
| parent | a5d15c36ae3db3caff4eeb86fd7eb5cdbb928f2d (diff) | |
| parent | 99502731c6f093c8db82189d46b949657ad83b25 (diff) | |
| download | Qt-fde6b4cc1e720ae655ccac9d7f83c7d2dc4badc4.zip Qt-fde6b4cc1e720ae655ccac9d7f83c7d2dc4badc4.tar.gz Qt-fde6b4cc1e720ae655ccac9d7f83c7d2dc4badc4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativetransition.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativetransition.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp index f284156..ab8b116 100644 --- a/src/declarative/util/qdeclarativetransition.cpp +++ b/src/declarative/util/qdeclarativetransition.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Transition QDeclarativeTransition - \since 4.7 + \since 4.7 \brief The Transition element defines animated transitions that occur on state changes. \sa {qmlstates}{States}, {state-transitions}{Transitions}, {QtDeclarative} @@ -63,8 +63,6 @@ QT_BEGIN_NAMESPACE \internal \class QDeclarativeTransition \brief The QDeclarativeTransition class allows you to define animated transitions that occur on state changes. - - \ingroup group_states */ //ParallelAnimationWrapper allows us to do a "callback" when the animation finishes, rather than connecting |