diff options
author | Martin Smith <martin.smith@nokia.com> | 2011-04-01 11:04:00 (GMT) |
---|---|---|
committer | Martin Smith <martin.smith@nokia.com> | 2011-04-01 11:04:00 (GMT) |
commit | c49a91a9629122f01df285a0b436c7502abc769c (patch) | |
tree | 446c027aa379b00d3a6b673a4ad5c5600fe2408b /doc/src | |
parent | 131f429e43a5c382ae208af39bc5f889c39dee8b (diff) | |
parent | 85d854855548497d95bef70af4d650af931a26ac (diff) | |
download | Qt-c49a91a9629122f01df285a0b436c7502abc769c.zip Qt-c49a91a9629122f01df285a0b436c7502abc769c.tar.gz Qt-c49a91a9629122f01df285a0b436c7502abc769c.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc/src')
-rw-r--r-- | doc/src/demos/guitartuner.qdoc | 1 | ||||
-rw-r--r-- | doc/src/demos/mobiledemos.qdoc | 2 | ||||
-rw-r--r-- | doc/src/demos/qml-qtbubblelevel.qdoc | 2 |
3 files changed, 5 insertions, 0 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 |