summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative/declarativeui.qdoc
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@nokia.com>2010-07-14 04:06:57 (GMT)
committerLorn Potter <lorn.potter@nokia.com>2010-07-14 04:06:57 (GMT)
commit423e373ed0935ebe3d2f54a4c56101081c3311b5 (patch)
tree35e27c69dee1d96775f4a921e93f5cd2e574a834 /doc/src/declarative/declarativeui.qdoc
parenta9b6c59857c28f48e093abccaf9a89755b0995bc (diff)
parent444fa479484f80cbd5de3e9c5fa2b2e4082643dd (diff)
downloadQt-423e373ed0935ebe3d2f54a4c56101081c3311b5.zip
Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.tar.gz
Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.tar.bz2
Merge branch '4.7' of ../oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src/declarative/declarativeui.qdoc')
-rw-r--r--doc/src/declarative/declarativeui.qdoc11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index f113147..cd27c40 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -74,15 +74,15 @@ application or to build completely new applications. QML is fully \l
\list
\o \l {QML Documents}
\o \l {Property Binding}
-\o \l {Integrating JavaScript}
-\o \l {QML Scope}
\o \l {Network Transparency}
+\o \l {QML Scope}
+\o \l {Integrating JavaScript}
\o \l {Data Models}
\o \l {anchor-layout.html}{Anchor-based Layout}
\o \l {qdeclarativestates.html}{States}
\o \l {qdeclarativeanimation.html}{Animation}
-\o \l {qdeclarativemodules.html}{Modules}
\o \l {qdeclarativefocus.html}{Keyboard Focus}
+\o \l {qdeclarativemodules.html}{Modules}
\o \l {Extending types from QML}
\o \l {qdeclarativedynamicobjects.html}{Dynamic Object Creation}
\o \l {qmlruntime.html}{The Qt Declarative Runtime}
@@ -90,10 +90,10 @@ application or to build completely new applications. QML is fully \l
\section1 Using QML with C++
\list
-\o \l {Tutorial: Writing QML extensions with C++}
-\o \l {Extending QML in C++}
\o \l {Using QML in C++ Applications}
\o \l {Integrating QML with existing Qt UI code}
+\o \l {Tutorial: Writing QML extensions with C++}
+\o \l {Extending QML in C++}
\endlist
\section1 Reference
@@ -104,6 +104,7 @@ application or to build completely new applications. QML is fully \l
\o \l {QML Security}
\o \l {QtDeclarative Module}
\o \l {Debugging QML}
+\o \l {QML Viewer}
\o \l {QML Performance}
\o \l {QML Coding Conventions}
\endlist