summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-13 23:42:55 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-13 23:42:55 (GMT)
commit532c21c7fc0a4075fe691507ec17b3dea7e3c043 (patch)
tree59ccc05554f83fb227fd5014f52a7436ee0ba7cc
parentf61e387e754c846539ba1fbd82175fdf80a0b2d9 (diff)
parent7ba182ac8d1bdc0921eefd4678815cd494c7af37 (diff)
downloadQt-532c21c7fc0a4075fe691507ec17b3dea7e3c043.zip
Qt-532c21c7fc0a4075fe691507ec17b3dea7e3c043.tar.gz
Qt-532c21c7fc0a4075fe691507ec17b3dea7e3c043.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
-rw-r--r--doc/src/declarative/declarativeui.qdoc1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index a4f4bc7..e84932b 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -77,6 +77,7 @@ completely new applications. QML is fully \l {Extending QML in C++}{extensible
\o \l {QML Advanced Tutorial}{Tutorial: 'Same Game'}
\o \l {QML Examples and Walkthroughs}
\o \l {Using QML in C++ Applications}
+\o \l {QML for Qt programmers}
\endlist
\section1 Core QML Features: