summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative/declarativeui.qdoc
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-01-04 14:17:44 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-01-04 14:17:44 (GMT)
commitfc013b7be66a6d4fc13af8bd38b7e679ed3998af (patch)
treecc068fa05bbc357bce89f8c6dfe37d6308704a1e /doc/src/declarative/declarativeui.qdoc
parentbe41c140594ccea16ce17ccca7251d614cc75e1e (diff)
parent4d53a691aaac9789ddd4f9d4e968d28ace2181ca (diff)
downloadQt-fc013b7be66a6d4fc13af8bd38b7e679ed3998af.zip
Qt-fc013b7be66a6d4fc13af8bd38b7e679ed3998af.tar.gz
Qt-fc013b7be66a6d4fc13af8bd38b7e679ed3998af.tar.bz2
Merge branch 'master' into lighthouse-master
Diffstat (limited to 'doc/src/declarative/declarativeui.qdoc')
-rw-r--r--doc/src/declarative/declarativeui.qdoc6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index 01e1302..41b9952 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -91,9 +91,10 @@ Module.
\list
\o \l{QML Documents}
\o \l{Property Binding}
+\o \l{Anchor-based Layout in QML}
+\o \l{Writing QML Components: Properties, Methods and Signals}
\o \l{QML Scope}
\o \l{QML Modules}
-\o \l{Anchor-based Layout in QML}
\endlist
\section1 User Interaction
@@ -107,6 +108,7 @@ Module.
\section1 Handling Data
\list
+\o \l{QML Basic Types}{QML Basic Data Types}
\o \l{Using QML Positioner and Repeater Items}
\o \l{QML Data Models}
\o \l{Presenting Data with QML}
@@ -118,7 +120,6 @@ Module.
\list
\o \l{Qt Declarative UI Runtime}
\o \l{Integrating JavaScript}
-\o \l{Extending types from QML}
\o \l{Dynamic Object Management in QML}
\endlist
@@ -136,6 +137,7 @@ Module.
\list
\o \l{QML Elements}
+\o \l{QML Basic Types}
\o \l{QML Global Object}
\o \l{QML Internationalization}
\o \l{QML Security}