diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-09-09 05:48:15 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-09-09 05:48:15 (GMT) |
| commit | 539206ac11fc341db6e29ebdc3c838848f822bc5 (patch) | |
| tree | a7e1a7f79bf2a1140446f06a1aed01786be13f18 /doc | |
| parent | 4c0abed6af10a2722ad3f1fd352caa3fe673468e (diff) | |
| parent | ae7a3485c0e6748361789491af33ee7b7fe093bc (diff) | |
| download | Qt-539206ac11fc341db6e29ebdc3c838848f822bc5.zip Qt-539206ac11fc341db6e29ebdc3c838848f822bc5.tar.gz Qt-539206ac11fc341db6e29ebdc3c838848f822bc5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/tutorials/declarative.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index bfaf4ab..ca17fda 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -37,6 +37,7 @@ The following table lists the QML elements provided by the Qt Declarative module \o \l ScriptAction \o \l Transition \o \l Follow +\o \l EaseFollow \o \l Behavior \endlist @@ -100,7 +101,6 @@ The following table lists the QML elements provided by the Qt Declarative module \o \l Loader \o \l Repeater \o \l SystemPalette -\o \l ComponentInstance \o \l GraphicsObjectContainer \endlist diff --git a/doc/src/tutorials/declarative.qdoc b/doc/src/tutorials/declarative.qdoc index 7780988..48beabd 100644 --- a/doc/src/tutorials/declarative.qdoc +++ b/doc/src/tutorials/declarative.qdoc @@ -392,7 +392,7 @@ the contact field. There are also two other ways to reuse components in QML. A component - can be reused from within the same QML file using Component and ComponentInstance + can be reused from within the same QML file using Component and Loader elements. The next code snippet produces three red rounded rectangles within a large blue rectangle. |