summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-08-23 00:33:52 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-08-23 00:33:52 (GMT)
commit6a3945d3ca3185c00597dcaefb93617620973ff5 (patch)
tree0534630f29a2d513621adf33c6fb25085fcab220 /doc/src/declarative
parent1690ad91cc9e686e688aa7832a16cbf2c9336948 (diff)
parent67e90b8a5701ef5b0653f012e74debc91e1b3b49 (diff)
downloadQt-6a3945d3ca3185c00597dcaefb93617620973ff5.zip
Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.tar.gz
Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc/src/declarative')
-rw-r--r--doc/src/declarative/declarativeui.qdoc4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index ed8b734..e1c9473 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -28,6 +28,8 @@
/*!
\title Qt Quick
\page qtquick.html
+\ingroup qt-gui-concepts
+
\brief Qt Quick provides a declarative framework for building highly
dynamic, custom user interfaces.
@@ -88,11 +90,11 @@ Module.
\o \l{QML Modules}
\o \l{Extending types from QML}
\o \l{Dynamic Object Management in QML}
-\o \l{Qt Declarative UI Runtime}
\endlist
\section1 Using QML with C++
\list
+\o \l{Qt Declarative UI Runtime}
\o \l{Using QML in C++ Applications}
\o \l{Integrating QML with existing Qt UI code}
\o \l{Tutorial: Writing QML extensions with C++}