diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-04-30 00:18:49 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-04-30 00:18:49 (GMT) |
| commit | 54839beaabb62da8ca238b64683b56e66e1ff10b (patch) | |
| tree | 184394839eaf3769c37d4f38fea603f93d915ea8 /doc | |
| parent | 7a60538c0c12245e8b542a477bcaabac0b9de345 (diff) | |
| parent | 4f98e50ef93f213cc47e5f49cd844b27b8115f99 (diff) | |
| download | Qt-54839beaabb62da8ca238b64683b56e66e1ff10b.zip Qt-54839beaabb62da8ca238b64683b56e66e1ff10b.tar.gz Qt-54839beaabb62da8ca238b64683b56e66e1ff10b.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton2.qml
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton3.qml
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton4.qml
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton5.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField1.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField2.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField3.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField4.qml
examples/declarative/tutorials/contacts/2_Reuse/FieldText3.qml
examples/declarative/tutorials/contacts/2_Reuse/FieldText4.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton1.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton3.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton4.qml
examples/declarative/tutorials/contacts/3_Collections/Button.qml
examples/declarative/tutorials/contacts/3_Collections/ContactField.qml
examples/declarative/tutorials/contacts/3_Collections/FieldText.qml
examples/declarative/tutorials/contacts/3_Collections/RemoveButton.qml
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/declarative/examples.qdoc | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 8fff472..8955587 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -16,7 +16,7 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \list -\o \l StateGroup +\o \l State \o \l SetProperty \o \l SetProperties \o \l ParentChange diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc index 17fda4d..e65808f 100644 --- a/doc/src/declarative/examples.qdoc +++ b/doc/src/declarative/examples.qdoc @@ -17,10 +17,14 @@ directory, bin/duiviewer $QT_SOURCE_DIR/examples/declarative/mediabrowser/mediabrowser.qml \endcode -Many other simple demos can be found under the \c examples/declarative sub +Many other simple examples can be found under the \c examples/declarative sub directory. Some can be run directly using the viewer like those above, and others require you to build and run an executable. +More sophisticated demos of large applications can be found under the \c demos/declarative +sub directory. These are intended to show more integrated functionality rather than +to be instructive on specific elements. + Finally, check out the \l {tutorial} to learn a little more about writing your own QML-based applications. |