diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-08-12 07:12:25 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-08-12 07:12:25 (GMT) |
| commit | 224d8f7619447a4784da533ac26760ea1e7b9087 (patch) | |
| tree | 5407614135100025a375acf049ace2074e3e6f11 /src/declarative/util/qdeclarativestategroup.cpp | |
| parent | e7a19af4430b45f371bb33120f0ed39a2c83b733 (diff) | |
| parent | add9c43407a63c28f1107b9a77e74f6f62593246 (diff) | |
| download | Qt-224d8f7619447a4784da533ac26760ea1e7b9087.zip Qt-224d8f7619447a4784da533ac26760ea1e7b9087.tar.gz Qt-224d8f7619447a4784da533ac26760ea1e7b9087.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativestategroup.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativestategroup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp index 67cd12e..1c1e964 100644 --- a/src/declarative/util/qdeclarativestategroup.cpp +++ b/src/declarative/util/qdeclarativestategroup.cpp @@ -112,7 +112,7 @@ public: } \endqml - \sa {qmlstate}{States} {state-transitions}{Transitions}, {QtDeclarative} + \sa {qmlstate}{States} {Transitions}, {QtDeclarative} */ QDeclarativeStateGroup::QDeclarativeStateGroup(QObject *parent) @@ -204,7 +204,7 @@ void QDeclarativeStateGroupPrivate::clear_states(QDeclarativeListProperty<QDecla } \endqml - \sa {state-transitions}{Transitions} + \sa {Transitions} */ QDeclarativeListProperty<QDeclarativeTransition> QDeclarativeStateGroup::transitionsProperty() { |