diff options
| author | Angus Cummings <angus.cummings@nokia.com> | 2012-05-31 11:57:21 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-01 06:35:50 +0200 |
| commit | 2e7c9e650c198db898f7f7137d773691dfe9864c (patch) | |
| tree | 6ca7d152b643fbce48e58646672501636aa45dc0 /doc | |
| parent | e063610527584526200c7e6636a5a493499450e3 (diff) | |
Renaming the QML overview page
There is a requirement that we refer to internal QML
groups as 'API' rather than 'plugin'
Change-Id: I8dc19435cf3f0d24f714b9840f5b83c6c74f7fa8
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/examples/declarative-camera.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/plugins/qml-multimedia.qdoc | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/doc/src/examples/declarative-camera.qdoc b/doc/src/examples/declarative-camera.qdoc index 5f02d855c..7219e85da 100644 --- a/doc/src/examples/declarative-camera.qdoc +++ b/doc/src/examples/declarative-camera.qdoc @@ -35,9 +35,8 @@ or video. \image qml-camera.png -This example demonstrates the basic use of the Camera QML Plugin types. The -plugin provides access to the API functionality for camera settings and -capturing an image. +This example demonstrates how to use the Qt Multimedia QML API to access +camera functions. It shows how to change settings and to capture images. Most of the QML code supports the user interface for this application with the camera types being mostly found in \e {declarative-camera.qml} and diff --git a/doc/src/plugins/qml-multimedia.qdoc b/doc/src/plugins/qml-multimedia.qdoc index 465f3a044..460f08a44 100644 --- a/doc/src/plugins/qml-multimedia.qdoc +++ b/doc/src/plugins/qml-multimedia.qdoc @@ -34,14 +34,14 @@ /*! \page qml-multimedia.html - \title Multimedia QML Plugin + \title Qt Multimedia QML API - \brief A QML plugin for the Qt Multimedia API. + \brief A QML API for the Qt Multimedia module. \section1 Overview - The Qt Multimedia API gives developers a simplified way to use audio and video playback, and access camera functionality. The Multimedia QML Plugin provides a QML friendly interface to these features. + The Qt Multimedia module gives developers a simplified way to use audio and video playback, and access camera functionality. The Multimedia QML API provides a QML friendly interface to these features. \section1 Types |