summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-08-24 14:08:28 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-08-24 14:08:28 (GMT)
commitc408dd8a80d509f18ec3c3bc8a74891f541f6fdd (patch)
treea29369b3d1e03f8f688b128e231c004081028bb6 /doc/src/declarative
parentef9cc109f1a6fe84ca27a6c8a53f1783b8bdf14d (diff)
parenta8030e0c543e538652605557843b845f89b11589 (diff)
downloadQt-c408dd8a80d509f18ec3c3bc8a74891f541f6fdd.zip
Qt-c408dd8a80d509f18ec3c3bc8a74891f541f6fdd.tar.gz
Qt-c408dd8a80d509f18ec3c3bc8a74891f541f6fdd.tar.bz2
Merge branch '4.7' into qmldocs
Diffstat (limited to 'doc/src/declarative')
-rw-r--r--doc/src/declarative/declarativeui.qdoc3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index 506d774..9609954 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.
@@ -121,6 +123,7 @@ Module.
\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++}