diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-04-10 20:19:34 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-11 03:31:52 +0200 |
| commit | 8484b0ff9c40fe70cdfc17bf74b0a5be93d674de (patch) | |
| tree | 2ba877c627c1279fd0e558dc736c8fdec4440906 /doc | |
| parent | 9b162f98440c00dcc0ee4d3b80970a9dc8dc766c (diff) | |
Fix a number of doc errors and warnings.
* Document a few missing classes/functions/methods
* Fix a number of QML snippets that wouldn't work as standalone snippets
* Add files to .pro so they show up in Creator..
Still the mysterious lack of controls dir documentation persists :/
Change-Id: I57162371a4d966e4db5bdb1b71d1baf9c0ca57c3
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc.pro | 24 | ||||
| -rw-r--r-- | doc/src/audioengineoverview.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/plugins/qml-multimedia.qdoc | 25 |
3 files changed, 42 insertions, 8 deletions
diff --git a/doc/doc.pro b/doc/doc.pro index 314a87398..db2f31196 100644 --- a/doc/doc.pro +++ b/doc/doc.pro @@ -8,3 +8,27 @@ TEMPLATE = subdirs # Doc snippets use widgets !isEmpty(QT.widgets.name): SUBDIRS += src/snippets + +OTHER_FILES += \ + src/audioengineoverview.qdoc \ + src/audiooverview.qdoc \ + src/cameraoverview.qdoc \ + src/changes.qdoc \ + src/multimediabackend.qdoc \ + src/multimedia.qdoc \ + src/qtmultimedia5.qdoc \ + src/radiooverview.qdoc \ + src/videooverview.qdoc \ + src/examples/audiodevices.qdoc \ + src/examples/audioinput.qdoc \ + src/examples/audiooutput.qdoc \ + src/examples/audiorecorder.qdoc \ + src/examples/camera.qdoc \ + src/examples/declarative-camera.qdoc \ + src/examples/declarative-radio.qdoc \ + src/examples/player.qdoc \ + src/examples/qmlvideofx.qdoc \ + src/examples/qmlvideo.qdoc \ + src/examples/spectrum.qdoc \ + src/examples/videographicsitem.qdoc \ + src/examples/videowidget.qdoc diff --git a/doc/src/audioengineoverview.qdoc b/doc/src/audioengineoverview.qdoc index 888293e82..483447cbf 100644 --- a/doc/src/audioengineoverview.qdoc +++ b/doc/src/audioengineoverview.qdoc @@ -51,6 +51,7 @@ import QtAudioEngine 1.0 AudioEngine { //... +} \endqml \section1 Examples diff --git a/doc/src/plugins/qml-multimedia.qdoc b/doc/src/plugins/qml-multimedia.qdoc index d264c1541..25a9ec59f 100644 --- a/doc/src/plugins/qml-multimedia.qdoc +++ b/doc/src/plugins/qml-multimedia.qdoc @@ -58,15 +58,20 @@ import QtMultimedia 5.0 // ... - Audio { - id: playMusic - source: "music.wav" - } + Item { + width: 640 + height: 360 + + Audio { + id: playMusic + source: "music.wav" + } - MouseArea { - id: playArea - anchors.fill: parent - onPressed: { playMusic.play() } + MouseArea { + id: playArea + anchors.fill: parent + onPressed: { playMusic.play() } + } } \endqml @@ -194,6 +199,9 @@ import QtQuick 2.0 import QtMultimedia 5.0 + Item { + width: 640 + height: 360 SoundEffect { id: effect @@ -204,6 +212,7 @@ anchors.fill: parent onPressed: { effect.play() } } + } \endqml |