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>
This commit is contained in:
Jerome Pasion
2013-10-01 15:38:29 +02:00
committed by The Qt Project
parent 28df116570
commit 40908fdb77
15 changed files with 16 additions and 16 deletions

View File

@@ -47,7 +47,7 @@ import QtMultimedia 5.0
\inherits Item \inherits Item
\ingroup multimedia_qml \ingroup multimedia_qml
\ingroup multimedia_video_qml \ingroup multimedia_video_qml
\inqmlmodule QtMultimedia 5.0 \inqmlmodule QtMultimedia
\brief A convenience type for showing a specified video. \brief A convenience type for showing a specified video.
\c Video is a convenience type combining the functionality \c Video is a convenience type combining the functionality

View File

@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
\instantiates QDeclarativeAudio \instantiates QDeclarativeAudio
\brief Add audio playback to a scene. \brief Add audio playback to a scene.
\inqmlmodule QtMultimedia 5.0 \inqmlmodule QtMultimedia
\ingroup multimedia_qml \ingroup multimedia_qml
\ingroup multimedia_audio_qml \ingroup multimedia_audio_qml
@@ -1123,7 +1123,7 @@ void QDeclarativeAudio::_q_statusChanged()
\instantiates QDeclarativeAudio \instantiates QDeclarativeAudio
\brief Add media playback to a scene. \brief Add media playback to a scene.
\inqmlmodule QtMultimedia 5.0 \inqmlmodule QtMultimedia
\ingroup multimedia_qml \ingroup multimedia_qml
\ingroup multimedia_audio_qml \ingroup multimedia_audio_qml
\ingroup multimedia_video_qml \ingroup multimedia_video_qml

View File

@@ -79,7 +79,7 @@ void QDeclarativeCamera::_q_availabilityChanged(QMultimedia::AvailabilityStatus
\brief Access viewfinder frames, and take photos and movies. \brief Access viewfinder frames, and take photos and movies.
\ingroup multimedia_qml \ingroup multimedia_qml
\ingroup camera_qml \ingroup camera_qml
\inqmlmodule QtMultimedia 5.0 \inqmlmodule QtMultimedia
\inherits Item \inherits Item

View File

@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
\instantiates QDeclarativeCameraCapture \instantiates QDeclarativeCameraCapture
\brief An interface for capturing camera images \brief An interface for capturing camera images
\ingroup multimedia_qml \ingroup multimedia_qml
\inqmlmodule QtMultimedia 5.0 \inqmlmodule QtMultimedia
\ingroup camera_qml \ingroup camera_qml
This type allows you to capture still images and be notified when they This type allows you to capture still images and be notified when they

View File

@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
\brief An interface for exposure related camera settings. \brief An interface for exposure related camera settings.
\ingroup multimedia_qml \ingroup multimedia_qml
\ingroup camera_qml \ingroup camera_qml
\inqmlmodule QtMultimedia 5.0 \inqmlmodule QtMultimedia
This type is part of the \b{QtMultimedia 5.0} module. This type is part of the \b{QtMultimedia 5.0} module.

View File

@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
/*! /*!
\qmltype CameraFlash \qmltype CameraFlash
\instantiates QDeclarativeCameraFlash \instantiates QDeclarativeCameraFlash
\inqmlmodule QtMultimedia 5.0 \inqmlmodule QtMultimedia
\brief An interface for flash related camera settings. \brief An interface for flash related camera settings.
\ingroup multimedia_qml \ingroup multimedia_qml
\ingroup camera_qml \ingroup camera_qml

View File

@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
/*! /*!
\qmltype CameraFocus \qmltype CameraFocus
\instantiates QDeclarativeCameraFocus \instantiates QDeclarativeCameraFocus
\inqmlmodule QtMultimedia 5.0 \inqmlmodule QtMultimedia
\brief An interface for focus related camera settings. \brief An interface for focus related camera settings.
\ingroup multimedia_qml \ingroup multimedia_qml
\ingroup camera_qml \ingroup camera_qml

View File

@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
/*! /*!
\qmltype CameraImageProcessing \qmltype CameraImageProcessing
\instantiates QDeclarativeCameraImageProcessing \instantiates QDeclarativeCameraImageProcessing
\inqmlmodule QtMultimedia 5.0 \inqmlmodule QtMultimedia
\brief An interface for camera capture related settings. \brief An interface for camera capture related settings.
\ingroup multimedia_qml \ingroup multimedia_qml
\ingroup camera_qml \ingroup camera_qml

View File

@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
/*! /*!
\qmltype CameraRecorder \qmltype CameraRecorder
\instantiates QDeclarativeCameraRecorder \instantiates QDeclarativeCameraRecorder
\inqmlmodule QtMultimedia 5.0 \inqmlmodule QtMultimedia
\brief Controls video recording with the Camera. \brief Controls video recording with the Camera.
\ingroup multimedia_qml \ingroup multimedia_qml
\ingroup camera_qml \ingroup camera_qml

View File

@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
/*! /*!
\qmltype Radio \qmltype Radio
\instantiates QDeclarativeRadio \instantiates QDeclarativeRadio
\inqmlmodule QtMultimedia 5.0 \inqmlmodule QtMultimedia
\brief Access radio functionality from a QML application. \brief Access radio functionality from a QML application.
\ingroup multimedia_qml \ingroup multimedia_qml
\ingroup multimedia_radio_qml \ingroup multimedia_radio_qml

View File

@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
/*! /*!
\qmltype RadioData \qmltype RadioData
\instantiates QDeclarativeRadioData \instantiates QDeclarativeRadioData
\inqmlmodule QtMultimedia 5.0 \inqmlmodule QtMultimedia
\brief Access RDS data from a QML application. \brief Access RDS data from a QML application.
\ingroup multimedia_qml \ingroup multimedia_qml
\ingroup multimedia_radio_qml \ingroup multimedia_radio_qml

View File

@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
/*! /*!
\qmltype Torch \qmltype Torch
\instantiates QDeclarativeTorch \instantiates QDeclarativeTorch
\inqmlmodule QtMultimedia 5.0 \inqmlmodule QtMultimedia
\brief Simple control over torch functionality \brief Simple control over torch functionality
\ingroup multimedia_qml \ingroup multimedia_qml

View File

@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia_qml \ingroup multimedia_qml
\ingroup multimedia_video_qml \ingroup multimedia_video_qml
\inqmlmodule QtMultimedia 5.0 \inqmlmodule QtMultimedia
\c VideoOutput is part of the \b{QtMultimedia 5.0} module. \c VideoOutput is part of the \b{QtMultimedia 5.0} module.

View File

@@ -89,7 +89,7 @@ QT_BEGIN_NAMESPACE
\inmodule QtMultimedia \inmodule QtMultimedia
\ingroup multimedia_qml \ingroup multimedia_qml
\ingroup multimedia_audio_qml \ingroup multimedia_audio_qml
\inqmlmodule QtMultimedia 5.0 \inqmlmodule QtMultimedia
SoundEffect is part of the \b{QtMultimedia 5.0} module. SoundEffect is part of the \b{QtMultimedia 5.0} module.

View File

@@ -26,7 +26,7 @@
****************************************************************************/ ****************************************************************************/
/*! /*!
\qmlmodule QtMultimedia 5 \qmlmodule QtMultimedia 5.0
\title Qt Multimedia QML Types \title Qt Multimedia QML Types
\ingroup qmlmodules \ingroup qmlmodules
\brief Provides QML types for multimedia support. \brief Provides QML types for multimedia support.