diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-11 03:59:15 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-11 03:59:15 (GMT) |
| commit | b63d7dc74b30b741c6481fb41d8bb3951a9bd763 (patch) | |
| tree | 22b22c6e45124e5f9a0a73109debcd6df67716e4 /src/declarative/util | |
| parent | e8d3e8e0b93271bb41fcdc264fc10ec59be5aa20 (diff) | |
| parent | cc2fe3a5e2a748a8284ee732befc6a25d193f0c0 (diff) | |
| download | Qt-b63d7dc74b30b741c6481fb41d8bb3951a9bd763.zip Qt-b63d7dc74b30b741c6481fb41d8bb3951a9bd763.tar.gz Qt-b63d7dc74b30b741c6481fb41d8bb3951a9bd763.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativestate.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index 7a78a2b..028bacb 100644 --- a/src/declarative/util/qdeclarativestate.cpp +++ b/src/declarative/util/qdeclarativestate.cpp @@ -160,7 +160,8 @@ QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObje \note Setting the state of an object from within another state of the same object is not allowed. - \sa {declarative/animation/states}{states example}, {qmlstates}{States}, {state-transitions}{Transitions}, QtDeclarative + \sa {declarative/animation/states}{states example}, {qmlstates}{States}, + {qdeclarativeanimation.html#transitions}{QML Transitions}, QtDeclarative */ /*! |