diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-04-14 04:47:16 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2011-04-14 04:47:16 (GMT) |
| commit | cc3bcc003048760a501debe49b6fcebffaac3cef (patch) | |
| tree | 5d8d8e5ea0cd1c9dffc6abd3e6e40058536236c8 /src/declarative/util/qdeclarativestategroup.cpp | |
| parent | a5d5971586d0a12e55374dae30e17454bca12600 (diff) | |
| parent | 662174b78b7e08c759d0086e215e81e9e0eaf0c5 (diff) | |
| download | Qt-cc3bcc003048760a501debe49b6fcebffaac3cef.zip Qt-cc3bcc003048760a501debe49b6fcebffaac3cef.tar.gz Qt-cc3bcc003048760a501debe49b6fcebffaac3cef.tar.bz2 | |
Merge branch 'master' of ../qt-qml-staging
Diffstat (limited to 'src/declarative/util/qdeclarativestategroup.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativestategroup.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp index f1d0997..6459bf9 100644 --- a/src/declarative/util/qdeclarativestategroup.cpp +++ b/src/declarative/util/qdeclarativestategroup.cpp @@ -88,7 +88,7 @@ public: /*! \qmlclass StateGroup QDeclarativeStateGroup - \ingroup qml-state-elements + \ingroup qml-state-elements \since 4.7 \brief The StateGroup element provides state support for non-Item elements. @@ -113,7 +113,7 @@ public: } \endqml - \sa {qmlstate}{States} {Transitions}, {QtDeclarative} + \sa {qmlstate}{States} {QML Animation and Transitions}{Transitions}, {QtDeclarative} */ QDeclarativeStateGroup::QDeclarativeStateGroup(QObject *parent) @@ -213,7 +213,7 @@ void QDeclarativeStateGroupPrivate::clear_states(QDeclarativeListProperty<QDecla } \endqml - \sa {Transitions} + \sa {QML Animation and Transitions}{Transitions} */ QDeclarativeListProperty<QDeclarativeTransition> QDeclarativeStateGroup::transitionsProperty() { |