diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2011-02-21 17:26:17 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2011-02-21 17:26:17 (GMT) |
| commit | dd372f3ac1ad746d152c6bb22cd410324f7f34cf (patch) | |
| tree | a3c16e7dd4888e18d4efc0bc33f82de63e0c4a76 /src/declarative/util/qdeclarativestate.cpp | |
| parent | 16d87b86f6e400ba97ab5f79b9762836c3b186d2 (diff) | |
| parent | 1d054b71a4a97d197f345e100e1dc9ed8712199a (diff) | |
| download | Qt-dd372f3ac1ad746d152c6bb22cd410324f7f34cf.zip Qt-dd372f3ac1ad746d152c6bb22cd410324f7f34cf.tar.gz Qt-dd372f3ac1ad746d152c6bb22cd410324f7f34cf.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativestate.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativestate.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index 5a4e2b1..5718e29 100644 --- a/src/declarative/util/qdeclarativestate.cpp +++ b/src/declarative/util/qdeclarativestate.cpp @@ -152,14 +152,14 @@ QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObje Notice the default state is referred to using an empty string (""). - States are commonly used together with \l {Transitions} to provide + States are commonly used together with \l{QML Animation and Transitions}{Transitions} to provide animations when state changes occur. \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}, - {qdeclarativeanimation.html#transitions}{QML Transitions}, QtDeclarative + {QML Animation and Transitions}{Transitions}, QtDeclarative */ QDeclarativeState::QDeclarativeState(QObject *parent) : QObject(*(new QDeclarativeStatePrivate), parent) |