diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-10-27 05:46:40 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-10-27 05:46:40 (GMT) |
| commit | f2c0f63c2db21e3a0dd2fb78312084a835840be8 (patch) | |
| tree | 2d54cc4b04864f30637bf7267799cd1bd38f35b6 /doc/src | |
| parent | 07bdaf208962b1c8605736f30920f4e6dfb0418e (diff) | |
| parent | a8fb485e1f2a7c2d6de913a2f0b3809b95c47e36 (diff) | |
| download | Qt-f2c0f63c2db21e3a0dd2fb78312084a835840be8.zip Qt-f2c0f63c2db21e3a0dd2fb78312084a835840be8.tar.gz Qt-f2c0f63c2db21e3a0dd2fb78312084a835840be8.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/animation.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/declarative/qmlreference.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/declarative/qtdeclarative.qdoc | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc index 2d98322..ef18de3 100644 --- a/doc/src/declarative/animation.qdoc +++ b/doc/src/declarative/animation.qdoc @@ -41,7 +41,6 @@ /*! \page qmlanimation.html -\target qmlanimation \title QML Animation Animation in QML is done by animating properties of objects. Properties of type diff --git a/doc/src/declarative/qmlreference.qdoc b/doc/src/declarative/qmlreference.qdoc index 76269c3..6a874b6 100644 --- a/doc/src/declarative/qmlreference.qdoc +++ b/doc/src/declarative/qmlreference.qdoc @@ -74,7 +74,7 @@ \o \l {qmlmodels}{Data Models} \o \l {anchor-layout}{Anchor-based Layout} \o \l {qmlstates}{States} - \o \l {qmlanimation}{Animation} + \o \l {qmlanimation.html}{Animation} \o \l {qmlmodules.html}{Modules} \o \l {qmlfocus}{Keyboard Focus} \o \l {Extending types from QML} diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc index ba2d70e..5d8623b 100644 --- a/doc/src/declarative/qtdeclarative.qdoc +++ b/doc/src/declarative/qtdeclarative.qdoc @@ -89,7 +89,7 @@ completely new applications. QML is fully \l {Extending QML}{extensible from C+ \o \l {qmlmodels}{Data Models} \o \l {anchor-layout}{Anchor-based Layout} \o \l {qmlstates}{States} -\o \l {qmlanimation}{Animation} +\o \l {qmlanimation.html}{Animation} \o \l {qmlmodules.html}{Modules} \o \l {qmlfocus}{Keyboard Focus} \o \l {Extending types from QML} |