diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml index bf53d5ff..e52d303f 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 1bd992d6..348c535a 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 5c416ab1..3c868a25 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 8b320669..a624ca70 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 d4a33260..c92b3525 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 085ae0bd..2cc52a96 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 4b5544d2..efde616e 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 ce450a3e..01ee8c09 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 360e5693..f7c49db9 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 62927c1b..93ed68ab 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 abff15a4..1e125bad 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 fa08fe79..462183f8 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 53c81040..91d15bef 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 e9f4cf2b..0f24dd5d 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 c1267f09..0dea4cf6 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.