summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-23 00:18:11 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-23 00:18:11 (GMT)
commit67e90b8a5701ef5b0653f012e74debc91e1b3b49 (patch)
tree2599817a1dbbcae6f85d1d8d6497de1c43b2c97b /doc
parentd9a32562ed281e0d4dbb194b3f3fce9f93f8cd46 (diff)
parent7d0d42d78ec218bf000c6c1b76d286cc2cedac2b (diff)
downloadQt-67e90b8a5701ef5b0653f012e74debc91e1b3b49.zip
Qt-67e90b8a5701ef5b0653f012e74debc91e1b3b49.tar.gz
Qt-67e90b8a5701ef5b0653f012e74debc91e1b3b49.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move link for Declarative UI Runtime to Using QML with C++ section
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/declarativeui.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index 9b44273..e1c9473 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -90,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++}