summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-04-05 14:43:20 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-04-05 14:43:20 (GMT)
commita343e8674947415f8ef3319c62a88f72458f25ad (patch)
tree54cf25c81f94911bf66b1f9f564970e91df3fdbe /doc
parent87a28f7ab7b1b94072e75740d690192bbdcfdaa5 (diff)
parenta01e0d1928aa17690d3e0ebadbac7b95bf0f0e84 (diff)
downloadQt-a343e8674947415f8ef3319c62a88f72458f25ad.zip
Qt-a343e8674947415f8ef3319c62a88f72458f25ad.tar.gz
Qt-a343e8674947415f8ef3319c62a88f72458f25ad.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc')
-rw-r--r--doc/src/demos/guitartuner.qdoc1
-rw-r--r--doc/src/demos/mobiledemos.qdoc2
-rw-r--r--doc/src/demos/qml-qtbubblelevel.qdoc2
-rw-r--r--doc/src/index.qdoc4
4 files changed, 6 insertions, 3 deletions
diff --git a/doc/src/demos/guitartuner.qdoc b/doc/src/demos/guitartuner.qdoc
index c669765..8678db1 100644
--- a/doc/src/demos/guitartuner.qdoc
+++ b/doc/src/demos/guitartuner.qdoc
@@ -40,5 +40,6 @@ code to the Qt Quick UI.
The example is hosted in Projects Forum Nokia: https://projects.forum.nokia.com/guitartuner
+\note This demonstration requires QtMobility libraries.
\image qml-guitartuner-example.png
*/
diff --git a/doc/src/demos/mobiledemos.qdoc b/doc/src/demos/mobiledemos.qdoc
index 47241a6..15fac7e 100644
--- a/doc/src/demos/mobiledemos.qdoc
+++ b/doc/src/demos/mobiledemos.qdoc
@@ -34,6 +34,8 @@
capabilities. Uses the multimedia and systeminfo modules of
\l{external: Qt Mobility Manual}{Qt Mobility}.
+ \note This demonstration requires QtMobility libraries.
+
*/
diff --git a/doc/src/demos/qml-qtbubblelevel.qdoc b/doc/src/demos/qml-qtbubblelevel.qdoc
index 63ac286..82ea4dc 100644
--- a/doc/src/demos/qml-qtbubblelevel.qdoc
+++ b/doc/src/demos/qml-qtbubblelevel.qdoc
@@ -37,6 +37,8 @@ as atraditional bubble level. The application provides a calibration feature to
handle any possible errors in accelerometer readings. The example is hosted in
Projects Forum Nokia: https://projects.forum.nokia.com/qtbubblelevel
+\note This demonstration requires QtMobility libraries.
+
\image qml-qtbubblelevel-demo.png
\section1 Initialising the application
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 69bb038..2d40400 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -80,7 +80,7 @@
\o \l{qt-deployment}{Deploying and Publishing Applications to Ovi Store}
\endlist
\list
- \o \l{Getting Started Guides}{Qt and Qt Quick Programming Guides}
+ \o \l{Getting Started Guides}{Qt and Qt Quick Programming Tutorials}
\endlist
\enddiv
\div {class="sectionlist normallist"}
@@ -135,8 +135,6 @@ innovative solutions using Qt.
\div {class="sectionlist normallist"}
\list
\o \l{QML Elements}
- \endlist
- \list
\o \l{external: Qt Mobility Manual}{Qt Mobility APIs}
\o \l{external: Qt Mobility QML Plugins}{Mobility QML Plugins}
\endlist