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>
This commit is contained in:
Michael Goddard
2012-04-10 20:19:34 +10:00
committed by Qt by Nokia
parent 9b162f9844
commit 8484b0ff9c
20 changed files with 594 additions and 327 deletions

View File

@@ -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

View File

@@ -51,6 +51,7 @@ import QtAudioEngine 1.0
AudioEngine {
//...
}
\endqml
\section1 Examples

View File

@@ -58,15 +58,20 @@
import QtMultimedia 5.0
// ...
Audio {
id: playMusic
source: "music.wav"
}
Item {
width: 640
height: 360
MouseArea {
id: playArea
anchors.fill: parent
onPressed: { playMusic.play() }
Audio {
id: playMusic
source: "music.wav"
}
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