summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-10-04 20:19:05 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-10-04 20:19:05 (GMT)
commitf7cfc5e3ef17d0be0d4290f05428033055fb8731 (patch)
treeb79a5fbf1320cea62bce7b99e62aed6b7326d397 /doc/src
parentc7b6c35e2b32b5d85f90088906d7ca6ecfe47202 (diff)
parentbf68eb1877e360a034f1b7808fd312452e2e4e36 (diff)
downloadQt-f7cfc5e3ef17d0be0d4290f05428033055fb8731.zip
Qt-f7cfc5e3ef17d0be0d4290f05428033055fb8731.tar.gz
Qt-f7cfc5e3ef17d0be0d4290f05428033055fb8731.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Added Qt Quick Components link to document
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/declarativeui.qdoc1
-rw-r--r--doc/src/declarative/elements.qdoc1
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index cecccf6..668f3b4 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -84,6 +84,7 @@ Qt applications.
\list
\o \l{QtWebKit QML Module}
\o \l{http://doc.qt.nokia.com/qtmobility-1.1.0/qml-plugins.html}{Mobility QML Plugins}
+\o \l {http://doc.qt.nokia.com/qt-components-symbian-1.1/index.html}{Qt Quick Components}
\endlist
\section1 Qt Quick Tools
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 6b7a5fc..fd74ee3 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -185,6 +185,7 @@ should first be obtained and installed.
\list
\o \l{WebView}{QtWebKit QML Module - WebView Element} - For displaying Web contents
\o \l{http://doc.qt.nokia.com/qtmobility-1.1.0/qml-plugins.html}{Mobility QML Plugins}
+\o \l {http://doc.qt.nokia.com/qt-components-symbian-1.1/index.html}{Qt Quick Components}
\endlist
*/