diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 10:18:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 10:18:27 (GMT) |
| commit | e8ef67cc13fd17e0ad3e4af4e78c465655044021 (patch) | |
| tree | e41d7825e48027214c3f2670ad77a4917ec74613 | |
| parent | 7b15ef17bae662ee06d0ae042a36f6b5cce72ccf (diff) | |
| parent | 85d854855548497d95bef70af4d650af931a26ac (diff) | |
| download | Qt-e8ef67cc13fd17e0ad3e4af4e78c465655044021.zip Qt-e8ef67cc13fd17e0ad3e4af4e78c465655044021.tar.gz Qt-e8ef67cc13fd17e0ad3e4af4e78c465655044021.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
Removed mobile demos from the Symbian build in demos.pro
| -rw-r--r-- | demos/demos.pro | 9 | ||||
| -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 |
4 files changed, 8 insertions, 6 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index 7f70cbb..b8b743c 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -21,11 +21,8 @@ SUBDIRS = \ symbian: SUBDIRS = \ demos_shared \ demos_deform \ - demos_pathstroke \ - demos_guitartuner \ - demos_qcamera \ - demos_qtbubblelevel \ - demos_quickhit + demos_pathstroke + wince*: SUBDIRS = \ demos_shared \ @@ -95,7 +92,7 @@ demos_qtdemo.subdir = qtdemo demos_mediaplayer.subdir = qmediaplayer demos_declarative.subdir = declarative -#mobile demos +#mobile demos. Requires QtMobility sources. Not included in demo build demos_guitartuner.subdir = mobile/guitartuner demos_qcamera.subdir = mobile/qcamera demos_qtbubblelevel.subdir = mobile/qtbubblelevel 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 |