diff options
| author | Angus Cummings <angus.cummings@nokia.com> | 2012-03-19 17:32:31 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-22 06:47:05 +0100 |
| commit | 5d6494f2487e65154c1caedfa09bfd407546af72 (patch) | |
| tree | 81aef9c34114732d91a3064fe0096cfead27a0a8 /doc | |
| parent | 8477d735c96f40f41208671ac4f78ca1e9eefe8a (diff) | |
resolving some warnings in qtmultimedia docs
Change-Id: I9df926f64548a5d53382448ca4eef8d428339aa3
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/examples/qmlvideo.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/examples/qmlvideofx.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/examples/video-qml-paint-rate.qdocinc | 2 | ||||
| -rw-r--r-- | doc/src/snippets/multimedia-snippets/camera.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/examples/qmlvideo.qdoc b/doc/src/examples/qmlvideo.qdoc index 3b186d179..7ac266443 100644 --- a/doc/src/examples/qmlvideo.qdoc +++ b/doc/src/examples/qmlvideo.qdoc @@ -128,7 +128,7 @@ element, the embedded \section1 Calculating and displaying QML painting rate -\include examples/video-qml-paint-rate.qdocinc +\input examples/video-qml-paint-rate.qdocinc All that remains is to connect the afterRendering() signal of the QQuickView object to a JavaScript function, which will eventually call frequencyItem.notify(): diff --git a/doc/src/examples/qmlvideofx.qdoc b/doc/src/examples/qmlvideofx.qdoc index 29d4425cd..acfb202d7 100644 --- a/doc/src/examples/qmlvideofx.qdoc +++ b/doc/src/examples/qmlvideofx.qdoc @@ -151,7 +151,7 @@ The abstraction of source item type is achieved by the \printuntil } \skipto function openVideo \printuntil "ContentVideo.qml" -\skipto contentLoader.item.source +\skipto contentLoader.item.mediaSource \printuntil path \skipto } \printuntil } @@ -202,7 +202,7 @@ And here is the effect selection menu: \section1 Calculating and displaying QML painting rate -\include examples/video-qml-paint-rate.qdocinc +\input examples/video-qml-paint-rate.qdocinc All that remains is to connect the afterRendering() signal of the QQuickView object to a JavaScript function, which will eventually call frequencyItem.notify(): diff --git a/doc/src/examples/video-qml-paint-rate.qdocinc b/doc/src/examples/video-qml-paint-rate.qdocinc index bc993fd66..84098e241 100644 --- a/doc/src/examples/video-qml-paint-rate.qdocinc +++ b/doc/src/examples/video-qml-paint-rate.qdocinc @@ -33,7 +33,7 @@ and its data is displayed by defining a QML item called FrequencyItem, like this \printuntil id: monitor \skipto onAverageFrequencyChanged \printuntil { -\skipto instantaneousFrequencyText +\skipto averageFrequencyText \printuntil /^\}/ The result looks like this: diff --git a/doc/src/snippets/multimedia-snippets/camera.cpp b/doc/src/snippets/multimedia-snippets/camera.cpp index 08a2e89b8..a44421e29 100644 --- a/doc/src/snippets/multimedia-snippets/camera.cpp +++ b/doc/src/snippets/multimedia-snippets/camera.cpp @@ -110,7 +110,7 @@ void overview_still() //on shutter button released camera->unlock(); - //! [Camera overview surface] + //! [Camera overview capture] } void overview_movie() |