diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2013-10-01 15:38:29 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-02 12:56:21 +0200 |
commit | 40908fdb77adcc59e8a60e3afd25ed13b451a5b3 (patch) | |
tree | 85d80254a3e4f06eb2040bf4c1e75a08ee9f4dcb | |
parent | 28df116570a1359585a314df17223a7b0e6b04c0 (diff) |
Doc: Updated usage of \qmlmodule and \inqmlmodule.
-\qmlmodule denotes the import statement "QtMultimedia 5.0"
-\inqmlmodule shouldn't have the version number and this commits removes
it because it is confusing.
Task-number: QTBUG-32172
Change-Id: I76f58ddd5ea2d5ae51eaae83a8408fd67611838a
Reviewed-by: Martin Smith <martin.smith@digia.com>
-rw-r--r-- | src/imports/multimedia/Video.qml | 2 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeaudio.cpp | 4 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 2 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecameracapture.cpp | 2 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecameraexposure.cpp | 2 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecameraflash.cpp | 2 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamerafocus.cpp | 2 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecameraimageprocessing.cpp | 2 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamerarecorder.cpp | 2 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeradio.cpp | 2 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeradiodata.cpp | 2 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativetorch.cpp | 2 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativevideooutput.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/audio/qsoundeffect.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/doc/src/qtmultimedia5.qdoc | 2 |
15 files changed, 16 insertions, 16 deletions
diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml index bf53d5ff5..e52d303f8 100644 --- a/src/imports/multimedia/Video.qml +++ b/src/imports/multimedia/Video.qml @@ -47,7 +47,7 @@ import QtMultimedia 5.0 \inherits Item \ingroup multimedia_qml \ingroup multimedia_video_qml - \inqmlmodule QtMultimedia 5.0 + \inqmlmodule QtMultimedia \brief A convenience type for showing a specified video. \c Video is a convenience type combining the functionality diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index 1bd992d6b..348c535a5 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE \instantiates QDeclarativeAudio \brief Add audio playback to a scene. - \inqmlmodule QtMultimedia 5.0 + \inqmlmodule QtMultimedia \ingroup multimedia_qml \ingroup multimedia_audio_qml @@ -1123,7 +1123,7 @@ void QDeclarativeAudio::_q_statusChanged() \instantiates QDeclarativeAudio \brief Add media playback to a scene. - \inqmlmodule QtMultimedia 5.0 + \inqmlmodule QtMultimedia \ingroup multimedia_qml \ingroup multimedia_audio_qml \ingroup multimedia_video_qml diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 5c416ab10..3c868a25d 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -79,7 +79,7 @@ void QDeclarativeCamera::_q_availabilityChanged(QMultimedia::AvailabilityStatus \brief Access viewfinder frames, and take photos and movies. \ingroup multimedia_qml \ingroup camera_qml - \inqmlmodule QtMultimedia 5.0 + \inqmlmodule QtMultimedia \inherits Item diff --git a/src/imports/multimedia/qdeclarativecameracapture.cpp b/src/imports/multimedia/qdeclarativecameracapture.cpp index 8b3206698..a624ca701 100644 --- a/src/imports/multimedia/qdeclarativecameracapture.cpp +++ b/src/imports/multimedia/qdeclarativecameracapture.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE \instantiates QDeclarativeCameraCapture \brief An interface for capturing camera images \ingroup multimedia_qml - \inqmlmodule QtMultimedia 5.0 + \inqmlmodule QtMultimedia \ingroup camera_qml This type allows you to capture still images and be notified when they diff --git a/src/imports/multimedia/qdeclarativecameraexposure.cpp b/src/imports/multimedia/qdeclarativecameraexposure.cpp index d4a33260e..c92b35251 100644 --- a/src/imports/multimedia/qdeclarativecameraexposure.cpp +++ b/src/imports/multimedia/qdeclarativecameraexposure.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \brief An interface for exposure related camera settings. \ingroup multimedia_qml \ingroup camera_qml - \inqmlmodule QtMultimedia 5.0 + \inqmlmodule QtMultimedia This type is part of the \b{QtMultimedia 5.0} module. diff --git a/src/imports/multimedia/qdeclarativecameraflash.cpp b/src/imports/multimedia/qdeclarativecameraflash.cpp index 085ae0bde..2cc52a966 100644 --- a/src/imports/multimedia/qdeclarativecameraflash.cpp +++ b/src/imports/multimedia/qdeclarativecameraflash.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype CameraFlash \instantiates QDeclarativeCameraFlash - \inqmlmodule QtMultimedia 5.0 + \inqmlmodule QtMultimedia \brief An interface for flash related camera settings. \ingroup multimedia_qml \ingroup camera_qml diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp index 4b5544d2a..efde616e9 100644 --- a/src/imports/multimedia/qdeclarativecamerafocus.cpp +++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype CameraFocus \instantiates QDeclarativeCameraFocus - \inqmlmodule QtMultimedia 5.0 + \inqmlmodule QtMultimedia \brief An interface for focus related camera settings. \ingroup multimedia_qml \ingroup camera_qml diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp index ce450a3e5..01ee8c097 100644 --- a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp +++ b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype CameraImageProcessing \instantiates QDeclarativeCameraImageProcessing - \inqmlmodule QtMultimedia 5.0 + \inqmlmodule QtMultimedia \brief An interface for camera capture related settings. \ingroup multimedia_qml \ingroup camera_qml diff --git a/src/imports/multimedia/qdeclarativecamerarecorder.cpp b/src/imports/multimedia/qdeclarativecamerarecorder.cpp index 360e56939..f7c49db93 100644 --- a/src/imports/multimedia/qdeclarativecamerarecorder.cpp +++ b/src/imports/multimedia/qdeclarativecamerarecorder.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype CameraRecorder \instantiates QDeclarativeCameraRecorder - \inqmlmodule QtMultimedia 5.0 + \inqmlmodule QtMultimedia \brief Controls video recording with the Camera. \ingroup multimedia_qml \ingroup camera_qml diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp index 62927c1bd..93ed68abe 100644 --- a/src/imports/multimedia/qdeclarativeradio.cpp +++ b/src/imports/multimedia/qdeclarativeradio.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype Radio \instantiates QDeclarativeRadio - \inqmlmodule QtMultimedia 5.0 + \inqmlmodule QtMultimedia \brief Access radio functionality from a QML application. \ingroup multimedia_qml \ingroup multimedia_radio_qml diff --git a/src/imports/multimedia/qdeclarativeradiodata.cpp b/src/imports/multimedia/qdeclarativeradiodata.cpp index abff15a43..1e125bad6 100644 --- a/src/imports/multimedia/qdeclarativeradiodata.cpp +++ b/src/imports/multimedia/qdeclarativeradiodata.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype RadioData \instantiates QDeclarativeRadioData - \inqmlmodule QtMultimedia 5.0 + \inqmlmodule QtMultimedia \brief Access RDS data from a QML application. \ingroup multimedia_qml \ingroup multimedia_radio_qml diff --git a/src/imports/multimedia/qdeclarativetorch.cpp b/src/imports/multimedia/qdeclarativetorch.cpp index fa08fe792..462183f8c 100644 --- a/src/imports/multimedia/qdeclarativetorch.cpp +++ b/src/imports/multimedia/qdeclarativetorch.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype Torch \instantiates QDeclarativeTorch - \inqmlmodule QtMultimedia 5.0 + \inqmlmodule QtMultimedia \brief Simple control over torch functionality \ingroup multimedia_qml diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp index 53c810403..91d15beff 100644 --- a/src/imports/multimedia/qdeclarativevideooutput.cpp +++ b/src/imports/multimedia/qdeclarativevideooutput.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE \ingroup multimedia_qml \ingroup multimedia_video_qml - \inqmlmodule QtMultimedia 5.0 + \inqmlmodule QtMultimedia \c VideoOutput is part of the \b{QtMultimedia 5.0} module. diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp index e9f4cf2bf..0f24dd5d8 100644 --- a/src/multimedia/audio/qsoundeffect.cpp +++ b/src/multimedia/audio/qsoundeffect.cpp @@ -89,7 +89,7 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia \ingroup multimedia_qml \ingroup multimedia_audio_qml - \inqmlmodule QtMultimedia 5.0 + \inqmlmodule QtMultimedia SoundEffect is part of the \b{QtMultimedia 5.0} module. diff --git a/src/multimedia/doc/src/qtmultimedia5.qdoc b/src/multimedia/doc/src/qtmultimedia5.qdoc index c1267f097..0dea4cf61 100644 --- a/src/multimedia/doc/src/qtmultimedia5.qdoc +++ b/src/multimedia/doc/src/qtmultimedia5.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! -\qmlmodule QtMultimedia 5 +\qmlmodule QtMultimedia 5.0 \title Qt Multimedia QML Types \ingroup qmlmodules \brief Provides QML types for multimedia support. |