Docs: fix qml links and standalone build for Multimedia

Change-Id: Ia3f1e49aef203911bb5cf1ee062c9100be213b38
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

13 files changed, 273 insertions, 259 deletions

diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 4e84f557b..0cc21f272 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
     \qmlclass MediaPlayer
     \brief The MediaPlayer element allows you to add media playback to a scene.
 
+    \inqmlmodule QtMultimedia 5
     \ingroup multimedia_qml
 
     This element is part of the \bold{QtMultimedia 5.0} module.
@@ -107,6 +108,7 @@ QT_BEGIN_NAMESPACE
     \qmlclass Audio QDeclarativeAudio
     \brief The Audio element allows you to add audio playback to a scene.
 
+    \inqmlmodule QtMultimedia 5
     \ingroup multimedia_qml
 
     This element is part of the \bold{QtMultimedia 5.0} module.
@@ -162,7 +164,7 @@ QDeclarativeAudio::~QDeclarativeAudio()
 }
 
 /*!
-    \qmlmethod Audio::play()
+    \qmlmethod QtMultimedia5::Audio::play()
 
     Starts playback of the media.
 
@@ -178,7 +180,7 @@ void QDeclarativeAudio::play()
 }
 
 /*!
-    \qmlmethod Audio::pause()
+    \qmlmethod QtMultimedia5::Audio::pause()
 
     Pauses playback of the media.
 
@@ -194,7 +196,7 @@ void QDeclarativeAudio::pause()
 }
 
 /*!
-    \qmlmethod Audio::stop()
+    \qmlmethod QtMultimedia5::Audio::stop()
 
     Stops playback of the media.
 
@@ -210,13 +212,13 @@ void QDeclarativeAudio::stop()
 }
 
 /*!
-    \qmlproperty url Audio::source
+    \qmlproperty url QtMultimedia5::Audio::source
 
     This property holds the source URL of the media.
 */
 
 /*!
-    \qmlproperty url Audio::autoLoad
+    \qmlproperty url QtMultimedia5::Audio::autoLoad
 
     This property indicates if loading of media should begin immediately.
 
@@ -224,32 +226,32 @@ void QDeclarativeAudio::stop()
 */
 
 /*!
-    \qmlsignal Audio::playbackStateChanged()
+    \qmlsignal QtMultimedia5::Audio::playbackStateChanged()
 
     This handler is called when the \l playbackState property is altered.
 */
 
 
 /*!
-    \qmlsignal Audio::paused()
+    \qmlsignal QtMultimedia5::Audio::paused()
 
     This handler is called when playback is paused.
 */
 
 /*!
-    \qmlsignal Audio::stopped()
+    \qmlsignal QtMultimedia5::Audio::stopped()
 
     This handler is called when playback is stopped.
 */
 
 /*!
-    \qmlsignal Audio::playing()
+    \qmlsignal QtMultimedia5::Audio::playing()
 
     This handler is called when playback is started or resumed.
 */
 
 /*!
-    \qmlproperty enumeration Audio::status
+    \qmlproperty enumeration QtMultimedia5::Audio::status
 
     This property holds the status of media loading. It can be one of:
 
@@ -273,7 +275,7 @@ QDeclarativeAudio::Status QDeclarativeAudio::status() const
 
 
 /*!
-    \qmlproperty enumeration Audio::playbackState
+    \qmlproperty enumeration QtMultimedia5::Audio::playbackState
 
     This property holds the state of media playback. It can be one of:
 
@@ -290,7 +292,7 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const
 }
 
 /*!
-    \qmlproperty int Audio::autoPlay
+    \qmlproperty int QtMultimedia5::Audio::autoPlay
 
     This property controls whether the media will begin to play on start up.
 
@@ -298,7 +300,7 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const
 */
 
 /*!
-    \qmlproperty int Audio::duration
+    \qmlproperty int QtMultimedia5::Audio::duration
 
     This property holds the duration of the media in milliseconds.
 
@@ -306,7 +308,7 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const
 */
 
 /*!
-    \qmlproperty int Audio::position
+    \qmlproperty int QtMultimedia5::Audio::position
 
     This property holds the current playback position in milliseconds.
 
@@ -314,19 +316,19 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const
 */
 
 /*!
-    \qmlproperty real Audio::volume
+    \qmlproperty real QtMultimedia5::Audio::volume
 
     This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume).
 */
 
 /*!
-    \qmlproperty bool Audio::muted
+    \qmlproperty bool QtMultimedia5::Audio::muted
 
     This property holds whether the audio output is muted.
 */
 
 /*!
-    \qmlproperty bool Audio::hasAudio
+    \qmlproperty bool QtMultimedia5::Audio::hasAudio
 
     This property holds whether the media contains audio.
 */
@@ -337,7 +339,7 @@ bool QDeclarativeAudio::hasAudio() const
 }
 
 /*!
-    \qmlproperty bool Audio::hasVideo
+    \qmlproperty bool QtMultimedia5::Audio::hasVideo
 
     This property holds whether the media contains video.
 */
@@ -348,14 +350,14 @@ bool QDeclarativeAudio::hasVideo() const
 }
 
 /*!
-    \qmlproperty real Audio::bufferProgress
+    \qmlproperty real QtMultimedia5::Audio::bufferProgress
 
     This property holds how much of the data buffer is currently filled, from 0.0 (empty) to 1.0
     (full).
 */
 
 /*!
-    \qmlproperty bool Audio::seekable
+    \qmlproperty bool QtMultimedia5::Audio::seekable
 
     This property holds whether position of the audio can be changed.
 
@@ -363,13 +365,13 @@ bool QDeclarativeAudio::hasVideo() const
 */
 
 /*!
-    \qmlproperty real Audio::playbackRate
+    \qmlproperty real QtMultimedia5::Audio::playbackRate
 
     This property holds the rate at which audio is played at as a multiple of the normal rate.
 */
 
 /*!
-    \qmlproperty enumeration Audio::error
+    \qmlproperty enumeration QtMultimedia5::Audio::error
 
     This property holds the error state of the audio.  It can be one of:
 
@@ -410,13 +412,13 @@ void QDeclarativeAudio::componentComplete()
 
 
 /*!
-    \qmlproperty string Audio::errorString
+    \qmlproperty string QtMultimedia5::Audio::errorString
 
     This property holds a string describing the current error condition in more detail.
 */
 
 /*!
-    \qmlsignal Audio::onError(error, errorString)
+    \qmlsignal QtMultimedia5::Audio::onError(error, errorString)
 
     This handler is called when an \l {QMediaPlayer::Error}{error} has
     occurred.  The errorString parameter may contain more detailed
@@ -424,7 +426,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.title
+    \qmlproperty variant QtMultimedia5::Audio::metaData.title
 
     This property holds the tile of the media.
 
@@ -432,7 +434,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.subTitle
+    \qmlproperty variant QtMultimedia5::Audio::metaData.subTitle
 
     This property holds the sub-title of the media.
 
@@ -440,7 +442,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.author
+    \qmlproperty variant QtMultimedia5::Audio::metaData.author
 
     This property holds the author of the media.
 
@@ -448,7 +450,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.comment
+    \qmlproperty variant QtMultimedia5::Audio::metaData.comment
 
     This property holds a user comment about the media.
 
@@ -456,7 +458,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.description
+    \qmlproperty variant QtMultimedia5::Audio::metaData.description
 
     This property holds a description of the media.
 
@@ -464,7 +466,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.category
+    \qmlproperty variant QtMultimedia5::Audio::metaData.category
 
     This property holds the category of the media
 
@@ -472,7 +474,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.genre
+    \qmlproperty variant QtMultimedia5::Audio::metaData.genre
 
     This property holds the genre of the media.
 
@@ -480,7 +482,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.year
+    \qmlproperty variant QtMultimedia5::Audio::metaData.year
 
     This property holds the year of release of the media.
 
@@ -488,7 +490,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.date
+    \qmlproperty variant QtMultimedia5::Audio::metaData.date
 
     This property holds the date of the media.
 
@@ -496,7 +498,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.userRating
+    \qmlproperty variant QtMultimedia5::Audio::metaData.userRating
 
     This property holds a user rating of the media in the range of 0 to 100.
 
@@ -504,7 +506,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.keywords
+    \qmlproperty variant QtMultimedia5::Audio::metaData.keywords
 
     This property holds a list of keywords describing the media.
 
@@ -512,7 +514,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.language
+    \qmlproperty variant QtMultimedia5::Audio::metaData.language
 
     This property holds the language of the media, as an ISO 639-2 code.
 
@@ -520,7 +522,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.publisher
+    \qmlproperty variant QtMultimedia5::Audio::metaData.publisher
 
     This property holds the publisher of the media.
 
@@ -528,7 +530,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.copyright
+    \qmlproperty variant QtMultimedia5::Audio::metaData.copyright
 
     This property holds the media's copyright notice.
 
@@ -536,7 +538,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.parentalRating
+    \qmlproperty variant QtMultimedia5::Audio::metaData.parentalRating
 
     This property holds the parental rating of the media.
 
@@ -544,7 +546,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.ratingOrganization
+    \qmlproperty variant QtMultimedia5::Audio::metaData.ratingOrganization
 
     This property holds the name of the rating organization responsible for the
     parental rating of the media.
@@ -553,7 +555,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.size
+    \qmlproperty variant QtMultimedia5::Audio::metaData.size
 
     This property property holds the size of the media in bytes.
 
@@ -561,7 +563,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.mediaType
+    \qmlproperty variant QtMultimedia5::Audio::metaData.mediaType
 
     This property holds the type of the media.
 
@@ -569,7 +571,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.audioBitRate
+    \qmlproperty variant QtMultimedia5::Audio::metaData.audioBitRate
 
     This property holds the bit rate of the media's audio stream ni bits per
     second.
@@ -578,7 +580,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.audioCodec
+    \qmlproperty variant QtMultimedia5::Audio::metaData.audioCodec
 
     This property holds the encoding of the media audio stream.
 
@@ -586,7 +588,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.averageLevel
+    \qmlproperty variant QtMultimedia5::Audio::metaData.averageLevel
 
     This property holds the average volume level of the media.
 
@@ -594,7 +596,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.channelCount
+    \qmlproperty variant QtMultimedia5::Audio::metaData.channelCount
 
     This property holds the number of channels in the media's audio stream.
 
@@ -602,7 +604,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.peakValue
+    \qmlproperty variant QtMultimedia5::Audio::metaData.peakValue
 
     This property holds the peak volume of media's audio stream.
 
@@ -610,7 +612,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.sampleRate
+    \qmlproperty variant QtMultimedia5::Audio::metaData.sampleRate
 
     This property holds the sample rate of the media's audio stream in hertz.
 
@@ -618,7 +620,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.albumTitle
+    \qmlproperty variant QtMultimedia5::Audio::metaData.albumTitle
 
     This property holds the title of the album the media belongs to.
 
@@ -626,7 +628,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.albumArtist
+    \qmlproperty variant QtMultimedia5::Audio::metaData.albumArtist
 
     This property holds the name of the principal artist of the album the media
     belongs to.
@@ -635,7 +637,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.contributingArtist
+    \qmlproperty variant QtMultimedia5::Audio::metaData.contributingArtist
 
     This property holds the names of artists contributing to the media.
 
@@ -643,7 +645,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.composer
+    \qmlproperty variant QtMultimedia5::Audio::metaData.composer
 
     This property holds the composer of the media.
 
@@ -651,7 +653,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.conductor
+    \qmlproperty variant QtMultimedia5::Audio::metaData.conductor
 
     This property holds the conductor of the media.
 
@@ -659,7 +661,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.lyrics
+    \qmlproperty variant QtMultimedia5::Audio::metaData.lyrics
 
     This property holds the lyrics to the media.
 
@@ -667,7 +669,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.mood
+    \qmlproperty variant QtMultimedia5::Audio::metaData.mood
 
     This property holds the mood of the media.
 
@@ -675,7 +677,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.trackNumber
+    \qmlproperty variant QtMultimedia5::Audio::metaData.trackNumber
 
     This property holds the track number of the media.
 
@@ -683,7 +685,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.trackCount
+    \qmlproperty variant QtMultimedia5::Audio::metaData.trackCount
 
     This property holds the number of track on the album containing the media.
 
@@ -691,7 +693,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.coverArtUrlSmall
+    \qmlproperty variant QtMultimedia5::Audio::metaData.coverArtUrlSmall
 
     This property holds the URL of a small cover art image.
 
@@ -699,7 +701,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.coverArtUrlLarge
+    \qmlproperty variant QtMultimedia5::Audio::metaData.coverArtUrlLarge
 
     This property holds the URL of a large cover art image.
 
@@ -707,7 +709,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.resolution
+    \qmlproperty variant QtMultimedia5::Audio::metaData.resolution
 
     This property holds the dimension of an image or video.
 
@@ -715,7 +717,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.pixelAspectRatio
+    \qmlproperty variant QtMultimedia5::Audio::metaData.pixelAspectRatio
 
     This property holds the pixel aspect ratio of an image or video.
 
@@ -723,7 +725,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.videoFrameRate
+    \qmlproperty variant QtMultimedia5::Audio::metaData.videoFrameRate
 
     This property holds the frame rate of the media's video stream.
 
@@ -731,7 +733,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.videoBitRate
+    \qmlproperty variant QtMultimedia5::Audio::metaData.videoBitRate
 
     This property holds the bit rate of the media's video stream in bits per
     second.
@@ -740,7 +742,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.videoCodec
+    \qmlproperty variant QtMultimedia5::Audio::metaData.videoCodec
 
     This property holds the encoding of the media's video stream.
 
@@ -748,7 +750,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.posterUrl
+    \qmlproperty variant QtMultimedia5::Audio::metaData.posterUrl
 
     This property holds the URL of a poster image.
 
@@ -756,7 +758,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.chapterNumber
+    \qmlproperty variant QtMultimedia5::Audio::metaData.chapterNumber
 
     This property holds the chapter number of the media.
 
@@ -764,7 +766,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.director
+    \qmlproperty variant QtMultimedia5::Audio::metaData.director
 
     This property holds the director of the media.
 
@@ -772,7 +774,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.leadPerformer
+    \qmlproperty variant QtMultimedia5::Audio::metaData.leadPerformer
 
     This property holds the lead performer in the media.
 
@@ -780,7 +782,7 @@ void QDeclarativeAudio::componentComplete()
 */
 
 /*!
-    \qmlproperty variant Audio::metaData.writer
+    \qmlproperty variant QtMultimedia5::Audio::metaData.writer
 
     This property holds the writer of the media.
 
diff --git a/src/imports/multimedia/qdeclarativeaudio_4.cpp b/src/imports/multimedia/qdeclarativeaudio_4.cpp
index 5cff803c7..094a264fc 100644
--- a/src/imports/multimedia/qdeclarativeaudio_4.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio_4.cpp
@@ -46,7 +46,7 @@
 QT_BEGIN_NAMESPACE
 
 
-/*!
+/*
     \qmlclass Audio QDeclarativeAudio
     \brief The Audio element allows you to add audio playback to a scene.
 
@@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE
     \sa Video
 */
 
-/*!
+/*
     \internal
     \class QDeclarativeAudio
     \brief The QDeclarativeAudio class provides an audio item that you can add to a QDeclarativeView.
@@ -104,7 +104,7 @@ QDeclarativeAudio_4::~QDeclarativeAudio_4()
     shutdown();
 }
 
-/*!
+/*
     \qmlmethod Audio::play()
 
     Starts playback of the media.
@@ -121,7 +121,7 @@ void QDeclarativeAudio_4::play()
     setPlaying(true);
 }
 
-/*!
+/*
     \qmlmethod Audio::pause()
 
     Pauses playback of the media.
@@ -138,7 +138,7 @@ void QDeclarativeAudio_4::pause()
     setPlaying(true);
 }
 
-/*!
+/*
     \qmlmethod Audio::stop()
 
     Stops playback of the media.
@@ -155,13 +155,13 @@ void QDeclarativeAudio_4::stop()
     setPaused(false);
 }
 
-/*!
+/*
     \qmlproperty url Audio::source
 
     This property holds the source URL of the media.
 */
 
-/*!
+/*
     \qmlproperty url Audio::autoLoad
 
     This property indicates if loading of media should begin immediately.
@@ -169,7 +169,7 @@ void QDeclarativeAudio_4::stop()
     Defaults to true, if false media will not be loaded until playback is started.
 */
 
-/*!
+/*
     \qmlproperty bool Audio::playing
 
     This property holds whether the media is playing.
@@ -177,7 +177,7 @@ void QDeclarativeAudio_4::stop()
     Defaults to false, and can be set to true to start playback.
 */
 
-/*!
+/*
     \qmlproperty bool Audio::paused
 
     This property holds whether the media is paused.
@@ -185,31 +185,31 @@ void QDeclarativeAudio_4::stop()
     Defaults to false, and can be set to true to pause playback.
 */
 
-/*!
+/*
     \qmlsignal Audio::onStarted()
 
     This handler is called when playback is started.
 */
 
-/*!
+/*
     \qmlsignal Audio::onResumed()
 
     This handler is called when playback is resumed from the paused state.
 */
 
-/*!
+/*
     \qmlsignal Audio::onPaused()
 
     This handler is called when playback is paused.
 */
 
-/*!
+/*
     \qmlsignal Audio::onStopped()
 
     This handler is called when playback is stopped.
 */
 
-/*!
+/*
     \qmlproperty enumeration Audio::status
 
     This property holds the status of media loading. It can be one of:
@@ -232,7 +232,7 @@ QDeclarativeAudio_4::Status QDeclarativeAudio_4::status() const
     return Status(m_status);
 }
 
-/*!
+/*
     \qmlproperty int Audio::duration
 
     This property holds the duration of the media in milliseconds.
@@ -240,7 +240,7 @@ QDeclarativeAudio_4::Status QDeclarativeAudio_4::status() const
     If the media doesn't have a fixed duration (a live stream for example) this will be 0.
 */
 
-/*!
+/*
     \qmlproperty int Audio::position
 
     This property holds the current playback position in milliseconds.
@@ -248,19 +248,19 @@ QDeclarativeAudio_4::Status QDeclarativeAudio_4::status() const
     If the \l seekable property is true, this property can be set to seek to a new position.
 */
 
-/*!
+/*
     \qmlproperty real Audio::volume
 
     This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume).
 */
 
-/*!
+/*
     \qmlproperty bool Audio::muted
 
     This property holds whether the audio output is muted.
 */
 
-/*!
+/*
     \qmlproperty bool Audio::hasAudio
 
     This property holds whether the media contains audio.
@@ -271,7 +271,7 @@ bool QDeclarativeAudio_4::hasAudio() const
     return !m_complete ? false : m_playerControl->isAudioAvailable();
 }
 
-/*!
+/*
     \qmlproperty bool Audio::hasVideo
 
     This property holds whether the media contains video.
@@ -282,14 +282,14 @@ bool QDeclarativeAudio_4::hasVideo() const
     return !m_complete ? false : m_playerControl->isVideoAvailable();
 }
 
-/*!
+/*
     \qmlproperty real Audio::bufferProgress
 
     This property holds how much of the data buffer is currently filled, from 0.0 (empty) to 1.0
     (full).
 */
 
-/*!
+/*
     \qmlproperty bool Audio::seekable
 
     This property holds whether position of the audio can be changed.
@@ -297,13 +297,13 @@ bool QDeclarativeAudio_4::hasVideo() const
     If true; setting a \l position value will cause playback to seek to the new position.
 */
 
-/*!
+/*
     \qmlproperty real Audio::playbackRate
 
     This property holds the rate at which audio is played at as a multiple of the normal rate.
 */
 
-/*!
+/*
     \qmlproperty enumeration Audio::error
 
     This property holds the error state of the audio.  It can be one of:
@@ -344,13 +344,13 @@ void QDeclarativeAudio_4::componentComplete()
 }
 
 
-/*!
+/*
     \qmlproperty string Audio::errorString
 
     This property holds a string describing the current error condition in more detail.
 */
 
-/*!
+/*
     \qmlsignal Audio::onError(error, errorString)
 
     This handler is called when an \l {QMediaPlayer::Error}{error} has
@@ -358,7 +358,7 @@ void QDeclarativeAudio_4::componentComplete()
     information about the error.
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.title
 
     This property holds the tile of the media.
@@ -366,7 +366,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Title}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.subTitle
 
     This property holds the sub-title of the media.
@@ -374,7 +374,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::SubTitle}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.author
 
     This property holds the author of the media.
@@ -382,7 +382,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Author}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.comment
 
     This property holds a user comment about the media.
@@ -390,7 +390,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Comment}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.description
 
     This property holds a description of the media.
@@ -398,7 +398,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Description}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.category
 
     This property holds the category of the media
@@ -406,7 +406,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Category}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.genre
 
     This property holds the genre of the media.
@@ -414,7 +414,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Genre}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.year
 
     This property holds the year of release of the media.
@@ -422,7 +422,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Year}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.date
 
     This property holds the date of the media.
@@ -430,7 +430,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Date}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.userRating
 
     This property holds a user rating of the media in the range of 0 to 100.
@@ -438,7 +438,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::UserRating}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.keywords
 
     This property holds a list of keywords describing the media.
@@ -446,7 +446,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Keywords}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.language
 
     This property holds the language of the media, as an ISO 639-2 code.
@@ -454,7 +454,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Language}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.publisher
 
     This property holds the publisher of the media.
@@ -462,7 +462,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Publisher}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.copyright
 
     This property holds the media's copyright notice.
@@ -470,7 +470,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Copyright}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.parentalRating
 
     This property holds the parental rating of the media.
@@ -478,7 +478,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::ParentalRating}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.ratingOrganization
 
     This property holds the name of the rating organization responsible for the
@@ -487,7 +487,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::RatingOrganization}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.size
 
     This property property holds the size of the media in bytes.
@@ -495,7 +495,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Size}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.mediaType
 
     This property holds the type of the media.
@@ -503,7 +503,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::MediaType}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.audioBitRate
 
     This property holds the bit rate of the media's audio stream ni bits per
@@ -512,7 +512,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::AudioBitRate}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.audioCodec
 
     This property holds the encoding of the media audio stream.
@@ -520,7 +520,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::AudioCodec}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.averageLevel
 
     This property holds the average volume level of the media.
@@ -528,7 +528,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::AverageLevel}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.channelCount
 
     This property holds the number of channels in the media's audio stream.
@@ -536,7 +536,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::ChannelCount}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.peakValue
 
     This property holds the peak volume of media's audio stream.
@@ -544,7 +544,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::PeakValue}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.sampleRate
 
     This property holds the sample rate of the media's audio stream in hertz.
@@ -552,7 +552,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::SampleRate}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.albumTitle
 
     This property holds the title of the album the media belongs to.
@@ -560,7 +560,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::AlbumTitle}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.albumArtist
 
     This property holds the name of the principal artist of the album the media
@@ -569,7 +569,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::AlbumArtist}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.contributingArtist
 
     This property holds the names of artists contributing to the media.
@@ -577,7 +577,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::ContributingArtist}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.composer
 
     This property holds the composer of the media.
@@ -585,7 +585,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Composer}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.conductor
 
     This property holds the conductor of the media.
@@ -593,7 +593,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Conductor}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.lyrics
 
     This property holds the lyrics to the media.
@@ -601,7 +601,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Lyrics}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.mood
 
     This property holds the mood of the media.
@@ -609,7 +609,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Mood}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.trackNumber
 
     This property holds the track number of the media.
@@ -617,7 +617,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::TrackNumber}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.trackCount
 
     This property holds the number of track on the album containing the media.
@@ -625,7 +625,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::TrackNumber}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.coverArtUrlSmall
 
     This property holds the URL of a small cover art image.
@@ -633,7 +633,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::CoverArtUrlSmall}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.coverArtUrlLarge
 
     This property holds the URL of a large cover art image.
@@ -641,7 +641,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::CoverArtUrlLarge}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.resolution
 
     This property holds the dimension of an image or video.
@@ -649,7 +649,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Resolution}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.pixelAspectRatio
 
     This property holds the pixel aspect ratio of an image or video.
@@ -657,7 +657,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::PixelAspectRatio}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.videoFrameRate
 
     This property holds the frame rate of the media's video stream.
@@ -665,7 +665,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::VideoFrameRate}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.videoBitRate
 
     This property holds the bit rate of the media's video stream in bits per
@@ -674,7 +674,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::VideoBitRate}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.videoCodec
 
     This property holds the encoding of the media's video stream.
@@ -682,7 +682,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::VideoCodec}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.posterUrl
 
     This property holds the URL of a poster image.
@@ -690,7 +690,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::PosterUrl}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.chapterNumber
 
     This property holds the chapter number of the media.
@@ -698,7 +698,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::ChapterNumber}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.director
 
     This property holds the director of the media.
@@ -706,7 +706,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::Director}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.leadPerformer
 
     This property holds the lead performer in the media.
@@ -714,7 +714,7 @@ void QDeclarativeAudio_4::componentComplete()
     \sa {QtMultimedia::MetaData::LeadPerformer}
 */
 
-/*!
+/*
     \qmlproperty variant Audio::metaData.writer
 
     This property holds the writer of the media.
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index b03067f77..f7c247f2a 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -73,6 +73,7 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state)
     \brief The Camera element allows you to access viewfinder frames, and take photos and movies.
     \ingroup multimedia_qml
     \ingroup camera_qml
+    \inqmlmodule QtMultimedia 5
 
     \inherits Item
 
@@ -83,6 +84,7 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state)
     viewfinder you can use a \l VideoOutput element with the Camera element set as the source.
 
     \qml
+
     import QtQuick 2.0
     import QtMultimedia 5.0
 
@@ -206,7 +208,7 @@ QDeclarativeCamera::Error QDeclarativeCamera::error() const
 }
 
 /*!
-    \qmlproperty string Camera::errorString
+    \qmlproperty string QtMultimedia5::Camera::errorString
 
     A description of the current error, if any.
 */
@@ -216,7 +218,7 @@ QString QDeclarativeCamera::errorString() const
 }
 
 /*!
-    \qmlproperty enumeration Camera::captureMode
+    \qmlproperty enumeration QtMultimedia5::Camera::captureMode
 
     \table
     \header \o Value \o Description
@@ -241,7 +243,7 @@ void QDeclarativeCamera::setCaptureMode(QDeclarativeCamera::CaptureMode mode)
 
 
 /*!
-    \qmlproperty enumeration Camera::cameraState
+    \qmlproperty enumeration QtMultimedia5::Camera::cameraState
 
     The current state of the camera object.
 
@@ -298,7 +300,7 @@ void QDeclarativeCamera::setCameraState(QDeclarativeCamera::State state)
 }
 
 /*!
-    \qmlmethod Camera::start()
+    \qmlmethod QtMultimedia5::Camera::start()
     \fn QDeclarativeCamera::start()
 
     Starts the camera.  Viewfinder frames will
@@ -311,7 +313,7 @@ void QDeclarativeCamera::start()
 }
 
 /*!
-    \qmlmethod Camera::stop()
+    \qmlmethod QtMultimedia5::Camera::stop()
     \fn QDeclarativeCamera::stop()
 
     Stops the camera, but leaves the camera
@@ -324,7 +326,7 @@ void QDeclarativeCamera::stop()
 
 
 /*!
-    \qmlproperty enumeration Camera::lockStatus
+    \qmlproperty enumeration QtMultimedia5::Camera::lockStatus
 
     The overall status for all the requested camera locks.
 
@@ -381,7 +383,7 @@ QDeclarativeCamera::LockStatus QDeclarativeCamera::lockStatus() const
 }
 
 /*!
-    \qmlmethod Camera::searchAndLock()
+    \qmlmethod QtMultimedia5::Camera::searchAndLock()
     \fn QDeclarativeCamera::searchAndLock()
 
     Start focusing, exposure and white balance calculation.
@@ -397,7 +399,7 @@ void QDeclarativeCamera::searchAndLock()
 }
 
 /*!
-    \qmlmethod Camera::unlock()
+    \qmlmethod QtMultimedia5::Camera::unlock()
     \fn QDeclarativeCamera::unlock()
 
     Unlock focus, exposure and white balance locks.
@@ -408,7 +410,7 @@ void QDeclarativeCamera::unlock()
 }
 
 /*!
-    \qmlproperty real Camera::maximumOpticalZoom
+    \qmlproperty real QtMultimedia5::Camera::maximumOpticalZoom
     \property QDeclarativeCamera::maximumOpticalZoom
 
     The maximum optical zoom factor, or 1.0 if optical zoom is not supported.
@@ -419,7 +421,7 @@ qreal QDeclarativeCamera::maximumOpticalZoom() const
 }
 
 /*!
-    \qmlproperty real Camera::maximumDigitalZoom
+    \qmlproperty real QtMultimedia5::Camera::maximumDigitalZoom
     \property  QDeclarativeCamera::maximumDigitalZoom
 
     The maximum digital zoom factor, or 1.0 if digital zoom is not supported.
@@ -430,7 +432,7 @@ qreal QDeclarativeCamera::maximumDigitalZoom() const
 }
 
 /*!
-    \qmlproperty real Camera::opticalZoom
+    \qmlproperty real QtMultimedia5::Camera::opticalZoom
     \property QDeclarativeCamera::opticalZoom
 
     The current optical zoom factor.
@@ -446,7 +448,7 @@ void QDeclarativeCamera::setOpticalZoom(qreal value)
 }
 
 /*!
-    \qmlproperty real Camera::digitalZoom
+    \qmlproperty real QtMultimedia5::Camera::digitalZoom
     \property   QDeclarativeCamera::digitalZoom
 
     The current digital zoom factor.
@@ -463,7 +465,7 @@ void QDeclarativeCamera::setDigitalZoom(qreal value)
 
 
 /*!
-    \qmlsignal Camera::onError(error, errorString)
+    \qmlsignal QtMultimedia5::Camera::onError(error, errorString)
 
     This handler is called when an error occurs.  The enumeration value \a error is one of the
     values defined below, and a descriptive string value is available in \a errorString.
diff --git a/src/imports/multimedia/qdeclarativecameracapture.cpp b/src/imports/multimedia/qdeclarativecameracapture.cpp
index f211d60ff..9dd036ba8 100644
--- a/src/imports/multimedia/qdeclarativecameracapture.cpp
+++ b/src/imports/multimedia/qdeclarativecameracapture.cpp
@@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE
     \qmlclass CameraCapture QDeclarativeCameraCapture
     \brief The CameraCapture element provides an interface for capturing camera images
     \ingroup multimedia_qml
+    \inqmlmodule QtMultimedia 5
     \ingroup camera_qml
 
     This element allows you to capture still images and be notified when they
@@ -119,7 +120,7 @@ QDeclarativeCameraCapture::~QDeclarativeCameraCapture()
 }
 
 /*!
-    \qmlproperty bool CameraCapture::ready
+    \qmlproperty bool QtMultimedia5::CameraCapture::ready
     \property QDeclarativeCameraCapture::ready
 
     Indicates camera is ready to capture photo.
@@ -130,7 +131,7 @@ bool QDeclarativeCameraCapture::isReadyForCapture() const
 }
 
 /*!
-    \qmlmethod CameraCapture::capture()
+    \qmlmethod QtMultimedia5::CameraCapture::capture()
     \fn QDeclarativeCameraCapture::capture()
 
     Start image capture.  The \l onImageCaptured() and \l onImageSaved() signals will
@@ -147,7 +148,7 @@ int QDeclarativeCameraCapture::capture()
 }
 
 /*!
-    \qmlmethod CameraCapture::captureToLocation(location)
+    \qmlmethod QtMultimedia5::CameraCapture::captureToLocation(location)
     \fn QDeclarativeCameraCapture::captureToLocation(const QString &location)
 
     Start image capture to specified \a location.  The \l onImageCaptured() and \l onImageSaved() signals will
@@ -162,7 +163,7 @@ int QDeclarativeCameraCapture::captureToLocation(const QString &location)
 }
 
 /*!
-    \qmlmethod CameraCapture::cancelCapture()
+    \qmlmethod QtMultimedia5::CameraCapture::cancelCapture()
     \fn QDeclarativeCameraCapture::cancelCapture()
 
     Cancel pending image capture requests.
@@ -174,7 +175,7 @@ void QDeclarativeCameraCapture::cancelCapture()
 }
 
 /*!
-    \qmlproperty string CameraCapture::capturedImagePath
+    \qmlproperty string QtMultimedia5::CameraCapture::capturedImagePath
     \property QDeclarativeCameraCapture::capturedImagePath
 
     The path to the last captured image.
@@ -212,7 +213,7 @@ void QDeclarativeCameraCapture::_q_captureFailed(int id, QCameraImageCapture::Er
 }
 
 /*!
-    \qmlproperty size CameraCapture::resolution
+    \qmlproperty size QtMultimedia5::CameraCapture::resolution
     \property QDeclarativeCameraCapture::resolution
 
     The resolution to capture the image at.  If empty, the system will pick
@@ -240,7 +241,7 @@ QCameraImageCapture::Error QDeclarativeCameraCapture::error() const
 
 
 /*!
-    \qmlproperty string CameraCapture::errorString
+    \qmlproperty string QtMultimedia5::CameraCapture::errorString
     \property QDeclarativeCameraCapture::errorString
 
     The last capture related error message.
@@ -251,7 +252,7 @@ QString QDeclarativeCameraCapture::errorString() const
 }
 
 /*!
-    \qmlmethod CameraCapture::setMetadata(key, value)
+    \qmlmethod QtMultimedia5::CameraCapture::setMetadata(key, value)
     \fn QDeclarativeCameraCapture::setMetadata(const QString &key, const QVariant &value)
 
     Sets a particular metadata \a key to \a value for the subsequent image captures.
@@ -263,7 +264,7 @@ void QDeclarativeCameraCapture::setMetadata(const QString &key, const QVariant &
 }
 
 /*!
-    \qmlsignal CameraCapture::onCaptureFailed(requestId, message)
+    \qmlsignal QtMultimedia5::CameraCapture::onCaptureFailed(requestId, message)
     \fn QDeclarativeCameraCapture::captureFailed(int requestId, const QString &message)
 
     This handler is called when an error occurs during capture with \a requestId.
@@ -271,7 +272,7 @@ void QDeclarativeCameraCapture::setMetadata(const QString &key, const QVariant &
 */
 
 /*!
-    \qmlsignal CameraCapture::onImageCaptured(requestId, preview)
+    \qmlsignal QtMultimedia5::CameraCapture::onImageCaptured(requestId, preview)
     \fn QDeclarativeCameraCapture::imageCaptured(int requestId, const QString &preview)
 
     This handler is called when an image with \a requestId has been captured
@@ -282,7 +283,7 @@ void QDeclarativeCameraCapture::setMetadata(const QString &key, const QVariant &
 */
 
 /*!
-    \qmlsignal CameraCapture::onImageSaved(requestId, path)
+    \qmlsignal QtMultimedia5::CameraCapture::onImageSaved(requestId, path)
     \fn QDeclarativeCameraCapture::imageSaved(int requestId, const QString &path)
 
     This handler is called after the image with \a requestId has been written to the filesystem.
@@ -293,7 +294,7 @@ void QDeclarativeCameraCapture::setMetadata(const QString &key, const QVariant &
 
 
 /*!
-    \qmlsignal CameraCapture::onImageMetadataAvailable(requestId, key, value)
+    \qmlsignal QtMultimedia5::CameraCapture::onImageMetadataAvailable(requestId, key, value)
     \fn QDeclarativeCameraCapture::imageMetadataAvailable(int requestId, const QString &key, const QVariant &value);
 
     This handler is called when the image with \a requestId has new metadata
diff --git a/src/imports/multimedia/qdeclarativecameraexposure.cpp b/src/imports/multimedia/qdeclarativecameraexposure.cpp
index 5bf030576..693f3ce5b 100644
--- a/src/imports/multimedia/qdeclarativecameraexposure.cpp
+++ b/src/imports/multimedia/qdeclarativecameraexposure.cpp
@@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
     \brief The CameraExposure element provides interface for exposure related camera settings.
     \ingroup multimedia_qml
     \ingroup camera_qml
+    \inqmlmodule QtMultimedia 5
 
     This element is part of the \bold{QtMultimedia 5.0} module.
 
@@ -118,7 +119,7 @@ QDeclarativeCameraExposure::~QDeclarativeCameraExposure()
 }
 
 /*!
-    \qmlproperty real CameraExposure::exposureCompensation
+    \qmlproperty real QtMultimedia5::CameraExposure::exposureCompensation
     \property QDeclarativeCameraExposure::exposureCompensation
 
     Adjustment for the automatically calculated exposure.  The value is
@@ -135,7 +136,7 @@ void QDeclarativeCameraExposure::setExposureCompensation(qreal ev)
 }
 
 /*!
-    \qmlproperty integer CameraExposure::iso
+    \qmlproperty integer QtMultimedia5::CameraExposure::iso
     \property QDeclarativeCameraExposure::iso
 
     The sensor's ISO sensitivity.
@@ -146,7 +147,7 @@ int QDeclarativeCameraExposure::isoSensitivity() const
 }
 
 /*!
-    \qmlproperty real CameraExposure::shutterSpeed
+    \qmlproperty real QtMultimedia5::CameraExposure::shutterSpeed
     \property QDeclarativeCameraExposure::shutterSpeed
 
     The camera's current shutter speed setting, in seconds.  To affect
@@ -160,7 +161,7 @@ qreal QDeclarativeCameraExposure::shutterSpeed() const
 }
 
 /*!
-    \qmlproperty real CameraExposure::aperture
+    \qmlproperty real QtMultimedia5::CameraExposure::aperture
     \property QDeclarativeCameraExposure::aperture
 
     The current lens aperture as an F number (the ratio of
@@ -174,7 +175,7 @@ qreal QDeclarativeCameraExposure::aperture() const
 }
 
 /*!
-    \qmlproperty integer CameraExposure::manualIsoSensitivity
+    \qmlproperty integer QtMultimedia5::CameraExposure::manualIsoSensitivity
     \property QDeclarativeCameraExposure::manualIsoSensitivity
 
     This property allows you to set a specific ISO setting
@@ -203,7 +204,7 @@ void QDeclarativeCameraExposure::setManualIsoSensitivity(int iso)
 }
 
 /*!
-    \qmlproperty real CameraExposure::manualShutterSpeed
+    \qmlproperty real QtMultimedia5::CameraExposure::manualShutterSpeed
     \property QDeclarativeCameraExposure::manualShutterSpeed
 
     This property allows you to set the shutter speed to
@@ -230,7 +231,7 @@ void QDeclarativeCameraExposure::setManualShutterSpeed(qreal speed)
 }
 
 /*!
-    \qmlproperty real CameraExposure::manualAperture
+    \qmlproperty real QtMultimedia5::CameraExposure::manualAperture
     \property QDeclarativeCameraExposure::manualAperture
 
     This property allows you to set the aperture (F number)
@@ -257,7 +258,7 @@ void QDeclarativeCameraExposure::setManualAperture(qreal aperture)
 }
 
 /*!
-    \qmlmethod CameraExposure::setAutoAperture()
+    \qmlmethod QtMultimedia5::CameraExposure::setAutoAperture()
   Turn on auto aperture selection. The manual aperture value is reset to -1.0
  */
 void QDeclarativeCameraExposure::setAutoAperture()
@@ -266,7 +267,7 @@ void QDeclarativeCameraExposure::setAutoAperture()
 }
 
 /*!
-    \qmlmethod CameraExposure::setAutoShutterSpeed()
+    \qmlmethod QtMultimedia5::CameraExposure::setAutoShutterSpeed()
   Turn on auto shutter speed selection. The manual shutter speed value is reset to -1.0
  */
 void QDeclarativeCameraExposure::setAutoShutterSpeed()
@@ -275,7 +276,7 @@ void QDeclarativeCameraExposure::setAutoShutterSpeed()
 }
 
 /*!
-    \qmlmethod CameraExposure::setAutoIsoSensitivity()
+    \qmlmethod QtMultimedia5::CameraExposure::setAutoIsoSensitivity()
   Turn on auto ISO sensitivity selection. The manual ISO value is reset to -1.
  */
 void QDeclarativeCameraExposure::setAutoIsoSensitivity()
@@ -284,7 +285,7 @@ void QDeclarativeCameraExposure::setAutoIsoSensitivity()
 }
 
 /*!
-    \qmlproperty enumeration CameraExposure::exposureMode
+    \qmlproperty enumeration QtMultimedia5::CameraExposure::exposureMode
     \property QDeclarativeCameraExposure::exposureMode
 
     Set the camera exposure mode to one of the following:
@@ -320,7 +321,7 @@ void QDeclarativeCameraExposure::setExposureMode(QDeclarativeCamera::ExposureMod
 }
 
 /*!
-    \qmlproperty QPointF CameraExposure::spotMeteringPoint
+    \qmlproperty QPointF QtMultimedia5::CameraExposure::spotMeteringPoint
     \property QDeclarativeCameraExposure::spotMeteringPoint
 
     The relative frame coordinates of the point to use for exposure metering.
@@ -343,7 +344,7 @@ void QDeclarativeCameraExposure::setSpotMeteringPoint(const QPointF &point)
 }
 
 /*!
-    \qmlproperty enumeration CameraExposure::meteringMode
+    \qmlproperty enumeration QtMultimedia5::CameraExposure::meteringMode
     \property QDeclarativeCameraExposure::meteringMode
 
     Set the camera metering mode (how exposure is balanced)
diff --git a/src/imports/multimedia/qdeclarativecameraflash.cpp b/src/imports/multimedia/qdeclarativecameraflash.cpp
index 6ef2da273..53b448e28 100644
--- a/src/imports/multimedia/qdeclarativecameraflash.cpp
+++ b/src/imports/multimedia/qdeclarativecameraflash.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass CameraFlash QDeclarativeCameraFlash
+    \inqmlmodule QtMultimedia 5
     \brief The CameraFlash element provides interface for flash related camera settings.
     \ingroup multimedia_qml
     \ingroup camera_qml
@@ -95,7 +96,7 @@ QDeclarativeCameraFlash::~QDeclarativeCameraFlash()
 }
 
 /*!
-    \qmlproperty bool QDeclarativeCameraFlash::ready
+    \qmlproperty bool QtMultimedia5::QDeclarativeCameraFlash::ready
     \property bool QDeclarativeCameraFlash::ready
 
     Indicates flash is charged.
@@ -106,7 +107,7 @@ bool QDeclarativeCameraFlash::isFlashReady() const
 }
 
 /*!
-    \qmlproperty enumeration CameraExposure::flashMode
+    \qmlproperty enumeration QtMultimedia5::CameraExposure::flashMode
     \property QDeclarativeCameraFlash::flashMode
 
     \table
@@ -140,12 +141,12 @@ void QDeclarativeCameraFlash::setFlashMode(int mode)
 }
 
 /*!
-    \qmlsignal CameraExposure::flashModeChanged(int)
+    \qmlsignal QtMultimedia5::CameraExposure::flashModeChanged(int)
     \fn void QDeclarativeCameraFlash::flashModeChanged(int)
 */
 
 /*!
-    \qmlsignal CameraExposure::flashReady(bool)
+    \qmlsignal QtMultimedia5::CameraExposure::flashReady(bool)
     \fn void QDeclarativeCameraFlash::flashReady(bool)
 */
 
diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp
index e25ebc10b..a75ebbf81 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus.cpp
+++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass CameraFocus QDeclarativeCameraFocus
+    \inqmlmodule QtMultimedia 5
     \brief The CameraFocus element provides interface for focus related camera settings.
     \ingroup multimedia_qml
     \ingroup camera_qml
@@ -103,7 +104,7 @@ QDeclarativeCameraFocus::~QDeclarativeCameraFocus()
 
 
 /*!
-    \qmlproperty Camera::FocusMode CameraFocus::focusMode
+    \qmlproperty QtMultimedia5::Camera::FocusMode CameraFocus::focusMode
     \property QDeclarativeCameraFocus::focusMode
 
     The current camera focus mode.
@@ -121,7 +122,7 @@ QDeclarativeCamera::FocusMode QDeclarativeCameraFocus::focusMode() const
 }
 
 /*!
-    \qmlmethod bool CameraFocus::isFocusModeSupported(mode)
+    \qmlmethod bool QtMultimedia5::CameraFocus::isFocusModeSupported(mode)
     \fn QDeclarativeCameraFocus::isFocusPointModeSupported(QDeclarativeCamera::FocusMode mode)
 
     Returns true if the supplied \a mode is a supported focus mode, and
@@ -138,7 +139,7 @@ void QDeclarativeCameraFocus::setFocusMode(QDeclarativeCamera::FocusMode mode)
 }
 
 /*!
-    \qmlproperty CameraFocus::FocusPointMode CameraFocus::focusPointMode
+    \qmlproperty QtMultimedia5::CameraFocus::FocusPointMode CameraFocus::focusPointMode
     \property QDeclarativeCameraFocus::focusPointMode
 
     The current camera focus point mode.  This is used in automatic
@@ -162,7 +163,7 @@ void QDeclarativeCameraFocus::setFocusPointMode(QDeclarativeCamera::FocusPointMo
 }
 
 /*!
-    \qmlmethod bool CameraFocus::isFocusPointModeSupported(mode)
+    \qmlmethod bool QtMultimedia5::CameraFocus::isFocusPointModeSupported(mode)
     \fn QDeclarativeCameraFocus::isFocusPointModeSupported(QDeclarativeCamera::FocusPointMode mode)
 
     Returns true if the supplied \a mode is a supported focus point mode, and
@@ -174,7 +175,7 @@ bool QDeclarativeCameraFocus::isFocusPointModeSupported(QDeclarativeCamera::Focu
 }
 
 /*!
-  \qmlproperty QPointF CameraFocus::customFocusPoint
+    \qmlproperty QPointF QtMultimedia5::CameraFocus::customFocusPoint
   \property QDeclarativeCameraFocus::customFocusPoint
 
   Position of custom focus point, in relative frame coordinates:
@@ -198,7 +199,7 @@ void QDeclarativeCameraFocus::setCustomFocusPoint(const QPointF &point)
 }
 
 /*!
-  \qmlproperty QPointF CameraFocus::focusZones
+    \qmlproperty QPointF QtMultimedia5::CameraFocus::focusZones
   \property QDeclarativeCameraFocus::focusZones
 
   List of current camera focus zones,
diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
index acbd1780e..e50a99996 100644
--- a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
+++ b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass CameraImageProcessing QDeclarativeCameraImageProcessing
+    \inqmlmodule QtMultimedia 5
     \brief The CameraCapture element provides an interface for camera capture related settings
     \ingroup multimedia_qml
     \ingroup camera_qml
@@ -93,7 +94,7 @@ QDeclarativeCameraImageProcessing::~QDeclarativeCameraImageProcessing()
 }
 
 /*!
-    \qmlproperty enumeration CameraImageProcessing::whiteBalanceMode
+    \qmlproperty enumeration QtMultimedia5::CameraImageProcessing::whiteBalanceMode
 
     \table
     \header \o Value \o Description
@@ -130,7 +131,7 @@ void QDeclarativeCameraImageProcessing::setWhiteBalanceMode(QDeclarativeCameraIm
 }
 
 /*!
-    \qmlproperty qreal CameraImageProcessing::manualWhiteBalance
+    \qmlproperty qreal QtMultimedia5::CameraImageProcessing::manualWhiteBalance
 
     The color temperature used when in manual white balance mode (WhiteBalanceManual).
     The units are Kelvin.
@@ -151,7 +152,7 @@ void QDeclarativeCameraImageProcessing::setManualWhiteBalance(qreal colorTemp) c
 }
 
 /*!
-    \qmlproperty int CameraImageProcessing::contrast
+    \qmlproperty int QtMultimedia5::CameraImageProcessing::contrast
 
     Image contrast adjustment.
     Valid contrast adjustment values range between -1.0 and 1.0, with a default of 0.
@@ -170,7 +171,7 @@ void QDeclarativeCameraImageProcessing::setContrast(qreal value)
 }
 
 /*!
-    \qmlproperty int CameraImageProcessing::saturation
+    \qmlproperty int QtMultimedia5::CameraImageProcessing::saturation
 
     Image saturation adjustment.
     Valid saturation adjustment values range between -1.0 and 1.0, the default is 0.
@@ -189,7 +190,7 @@ void QDeclarativeCameraImageProcessing::setSaturation(qreal value)
 }
 
 /*!
-    \qmlproperty int CameraImageProcessing::sharpeningLevel
+    \qmlproperty int QtMultimedia5::CameraImageProcessing::sharpeningLevel
 
     Adjustment of sharpening level applied to image.
 
@@ -210,7 +211,7 @@ void QDeclarativeCameraImageProcessing::setSharpeningLevel(qreal value)
 }
 
 /*!
-    \qmlproperty int CameraImageProcessing::denoisingLevel
+    \qmlproperty int QtMultimedia5::CameraImageProcessing::denoisingLevel
 
     Adjustment of denoising applied to image.
 
@@ -231,11 +232,11 @@ void QDeclarativeCameraImageProcessing::setDenoisingLevel(qreal value)
 }
 
 /*!
-    \qmlsignal Camera::whiteBalanceModeChanged(Camera::WhiteBalanceMode)
+    \qmlsignal QtMultimedia5::Camera::whiteBalanceModeChanged(Camera::WhiteBalanceMode)
 */
 
 /*!
-    \qmlsignal Camera::manualWhiteBalanceChanged(qreal)
+    \qmlsignal QtMultimedia5::Camera::manualWhiteBalanceChanged(qreal)
 */
 
 QT_END_NAMESPACE
diff --git a/src/imports/multimedia/qdeclarativecamerarecorder.cpp b/src/imports/multimedia/qdeclarativecamerarecorder.cpp
index c0351fb05..86a0d0002 100644
--- a/src/imports/multimedia/qdeclarativecamerarecorder.cpp
+++ b/src/imports/multimedia/qdeclarativecamerarecorder.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass CameraRecorder QDeclarativeCameraRecorder
+    \inqmlmodule QtMultimedia 5
     \brief The CameraRecorder element controls video recording with the Camera.
     \ingroup multimedia_qml
     \ingroup camera_qml
@@ -87,7 +88,7 @@ QDeclarativeCameraRecorder::~QDeclarativeCameraRecorder()
 }
 
 /*!
-    \qmlproperty size CameraRecorder::captureResolution
+    \qmlproperty size QtMultimedia5::CameraRecorder::captureResolution
 
     The video frame dimensions to use when capturing
     video.
@@ -98,7 +99,7 @@ QSize QDeclarativeCameraRecorder::captureResolution()
 }
 
 /*!
-    \qmlproperty string CameraRecorder::audioCodec
+    \qmlproperty string QtMultimedia5::CameraRecorder::audioCodec
 
     The audio codec to use for recording video.
     Typically this is something like \c aac or \c amr-wb.
@@ -111,7 +112,7 @@ QString QDeclarativeCameraRecorder::audioCodec() const
 }
 
 /*!
-    \qmlproperty string CameraRecorder::videoCodec
+    \qmlproperty string QtMultimedia5::CameraRecorder::videoCodec
 
     The video codec to use for recording video.
     Typically this is something like \c h264.
@@ -122,7 +123,7 @@ QString QDeclarativeCameraRecorder::videoCodec() const
 }
 
 /*!
-    \qmlproperty string CameraRecorder::mediaContainer
+    \qmlproperty string QtMultimedia5::CameraRecorder::mediaContainer
 
     The media container to use for recording video.
     Typically this is something like \c mp4.
@@ -169,7 +170,7 @@ void QDeclarativeCameraRecorder::setMediaContainer(const QString &container)
 }
 
 /*!
-    \qmlproperty qreal CameraRecorder::frameRate
+    \qmlproperty qreal QtMultimedia5::CameraRecorder::frameRate
 
     The video framerate to use when recording video,
     in frames per second.
@@ -180,7 +181,7 @@ qreal QDeclarativeCameraRecorder::frameRate() const
 }
 
 /*!
-    \qmlproperty int CameraRecorder::videoBitRate
+    \qmlproperty int QtMultimedia5::CameraRecorder::videoBitRate
 
     The video bit rate to use when recording video,
     in bits per second.
@@ -191,7 +192,7 @@ int QDeclarativeCameraRecorder::videoBitRate() const
 }
 
 /*!
-    \qmlproperty int CameraRecorder::audioBitRate
+    \qmlproperty int QtMultimedia5::CameraRecorder::audioBitRate
 
     The audio bit rate to use when recording video,
     in bits per second.
@@ -202,7 +203,7 @@ int QDeclarativeCameraRecorder::audioBitRate() const
 }
 
 /*!
-    \qmlproperty int CameraRecorder::audioChannels
+    \qmlproperty int QtMultimedia5::CameraRecorder::audioChannels
 
     The number of audio channels to encode when
     recording video (1 is mono, 2 is stereo).
@@ -213,7 +214,7 @@ int QDeclarativeCameraRecorder::audioChannels() const
 }
 
 /*!
-    \qmlproperty int CameraRecorder::audioSampleRate
+    \qmlproperty int QtMultimedia5::CameraRecorder::audioSampleRate
 
     The audio sample rate to encode audio at, when
     recording video.
@@ -275,7 +276,7 @@ QMediaRecorder::Error QDeclarativeCameraRecorder::error() const
 }
 
 /*!
-    \qmlproperty string Camera::errorString
+    \qmlproperty string QtMultimedia5::Camera::errorString
 
     A description of the current error, if any.
 */
@@ -285,7 +286,7 @@ QString QDeclarativeCameraRecorder::errorString() const
 }
 
 /*!
-    \qmlproperty enumeration CameraRecorder::recorderState
+    \qmlproperty enumeration QtMultimedia5::CameraRecorder::recorderState
 
     The current state of the camera recorder object.
 
@@ -310,7 +311,7 @@ QDeclarativeCameraRecorder::RecorderState QDeclarativeCameraRecorder::recorderSt
 }
 
 /*!
-    \qmlmethod CameraRecorder::record()
+    \qmlmethod QtMultimedia5::CameraRecorder::record()
 
     Starts recording.
 */
@@ -320,7 +321,7 @@ void QDeclarativeCameraRecorder::record()
 }
 
 /*!
-    \qmlmethod CameraRecorder::stop()
+    \qmlmethod QtMultimedia5::CameraRecorder::stop()
 
     Stops recording.
 */
@@ -345,7 +346,7 @@ void QDeclarativeCameraRecorder::setRecorderState(QDeclarativeCameraRecorder::Re
 }
 
 /*!
-    \qmlproperty string CameraRecorder::outputLocation
+    \qmlproperty string QtMultimedia5::CameraRecorder::outputLocation
     \property QDeclarativeCameraRecorder::outputLocation
 
     \brief the destination location of media content.
@@ -360,7 +361,7 @@ QString QDeclarativeCameraRecorder::outputLocation() const
 }
 
 /*!
-    \qmlproperty string CameraRecorder::actualLocation
+    \qmlproperty string QtMultimedia5::CameraRecorder::actualLocation
     \property QDeclarativeCameraRecorder::actualLocation
 
     \brief the actual location of the last media content.
@@ -383,7 +384,7 @@ void QDeclarativeCameraRecorder::setOutputLocation(const QString &location)
 }
 
 /*!
-    \qmlproperty int CameraRecorder::duration
+    \qmlproperty int QtMultimedia5::CameraRecorder::duration
     \property QDeclarativeCameraRecorder::duration
 
     Returns the current duration of the recording, in
@@ -395,7 +396,7 @@ qint64 QDeclarativeCameraRecorder::duration() const
 }
 
 /*!
-    \qmlproperty bool CameraRecorder::muted
+    \qmlproperty bool QtMultimedia5::CameraRecorder::muted
     \property QDeclarativeCameraRecorder::muted
 
     Whether or not the audio input is muted during
@@ -412,7 +413,7 @@ void QDeclarativeCameraRecorder::setMuted(bool muted)
 }
 
 /*!
-    \qmlmethod CameraRecorder::setMetadata(key, value)
+    \qmlmethod QtMultimedia5::CameraRecorder::setMetadata(key, value)
 
     Sets metadata for the next video to be recorder, with
     the given \a key being associated with \a value.
diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp
index 0b8a9386c..2fcde3dfa 100644
--- a/src/imports/multimedia/qdeclarativeradio.cpp
+++ b/src/imports/multimedia/qdeclarativeradio.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Radio QDeclarativeRadio
+    \inqmlmodule QtMultimedia 5
     \brief The Radio element allows you to access radio functionality from a QML application.
     \ingroup multimedia_qml
     \inherits Item
@@ -119,7 +120,7 @@ QDeclarativeRadio::~QDeclarativeRadio()
 }
 
 /*!
-    \qmlproperty enumeration Radio::state
+    \qmlproperty enumeration QtMultimedia5::Radio::state
 
     This property holds the current state of the Radio element.
 
@@ -141,7 +142,7 @@ QDeclarativeRadio::State QDeclarativeRadio::state() const
 }
 
 /*!
-    \qmlproperty enumeration Radio::band
+    \qmlproperty enumeration QtMultimedia5::Radio::band
 
     This property holds the frequency band used for the radio, which can be specified as
     any one of the values in the table below.
@@ -171,7 +172,7 @@ QDeclarativeRadio::Band QDeclarativeRadio::band() const
 }
 
 /*!
-    \qmlproperty int Radio::frequency
+    \qmlproperty int QtMultimedia5::Radio::frequency
 
     Sets the frequency in Hertz that the radio is tuned to. The frequency must be within the frequency
     range for the current band, otherwise it will be changed to be within the frequency range.
@@ -184,7 +185,7 @@ int QDeclarativeRadio::frequency() const
 }
 
 /*!
-    \qmlproperty enumeration Radio::stereoMode
+    \qmlproperty enumeration QtMultimedia5::Radio::stereoMode
 
     This property holds the stereo mode of the radio, which can be set to any one of the
     values in the table below.
@@ -208,7 +209,7 @@ QDeclarativeRadio::StereoMode QDeclarativeRadio::stereoMode() const
 }
 
 /*!
-    \qmlproperty int Radio::volume
+    \qmlproperty int QtMultimedia5::Radio::volume
 
     Set this property to control the volume of the radio. The valid range of the volume is from 0 to 100.
 */
@@ -218,7 +219,7 @@ int QDeclarativeRadio::volume() const
 }
 
 /*!
-    \qmlproperty bool Radio::muted
+    \qmlproperty bool QtMultimedia5::Radio::muted
 
     This property reflects whether the radio is muted or not.
 */
@@ -228,7 +229,7 @@ bool QDeclarativeRadio::muted() const
 }
 
 /*!
-    \qmlproperty bool Radio::stereo
+    \qmlproperty bool QtMultimedia5::Radio::stereo
 
     This property holds whether the radio is receiving a stereo signal or not. If \l stereoMode is
     set to ForceMono the value will always be false. Likewise, it will always be true if stereoMode
@@ -242,7 +243,7 @@ bool QDeclarativeRadio::stereo() const
 }
 
 /*!
-    \qmlproperty int Radio::signalStrength
+    \qmlproperty int QtMultimedia5::Radio::signalStrength
 
     The strength of the current radio signal as a percentage where 0% equals no signal, and 100% is a
     very good signal.
@@ -253,7 +254,7 @@ int QDeclarativeRadio::signalStrength() const
 }
 
 /*!
-    \qmlproperty bool Radio::searching
+    \qmlproperty bool QtMultimedia5::Radio::searching
 
     This property is true if the radio is currently searching for radio stations, for instance using the \l scanUp,
     \l scanDown, and \l searchAllStations methods. Once the search completes, or if it is cancelled using
@@ -265,7 +266,7 @@ bool QDeclarativeRadio::searching() const
 }
 
 /*!
-    \qmlproperty int Radio::frequencyStep
+    \qmlproperty int QtMultimedia5::Radio::frequencyStep
 
     The number of Hertz for each step when tuning the radio manually. The value is for the current \l band.
  */
@@ -275,7 +276,7 @@ int QDeclarativeRadio::frequencyStep() const
 }
 
 /*!
-    \qmlproperty int Radio::minimumFrequency
+    \qmlproperty int QtMultimedia5::Radio::minimumFrequency
 
     The minimum frequency for the current \l band.
  */
@@ -285,7 +286,7 @@ int QDeclarativeRadio::minimumFrequency() const
 }
 
 /*!
-    \qmlproperty int Radio::maximumFrequency
+    \qmlproperty int QtMultimedia5::Radio::maximumFrequency
 
     The maximum frequency for the current \l band.
  */
@@ -295,7 +296,7 @@ int QDeclarativeRadio::maximumFrequency() const
 }
 
 /*!
-    \qmlproperty int Radio::antennaConnected
+    \qmlproperty int QtMultimedia5::Radio::antennaConnected
 
     This property is true if there is an antenna connected. Otherwise it will be false.
  */
@@ -305,7 +306,7 @@ bool QDeclarativeRadio::isAntennaConnected() const
 }
 
 /*!
-    \qmlmethod bool Radio::isAvailable()
+    \qmlmethod bool QtMultimedia5::Radio::isAvailable()
 
     Returns whether the radio is ready to use.
  */
@@ -340,7 +341,7 @@ void QDeclarativeRadio::setMuted(bool muted)
 }
 
 /*!
-    \qmlmethod Radio::cancelScan()
+    \qmlmethod QtMultimedia5::Radio::cancelScan()
 
     Cancel the current scan. Will also cancel a search started with \l searchAllStations.
  */
@@ -350,7 +351,7 @@ void QDeclarativeRadio::cancelScan()
 }
 
 /*!
-    \qmlmethod Radio::scanDown()
+    \qmlmethod QtMultimedia5::Radio::scanDown()
 
     Searches backward in the frequency range for the current band.
  */
@@ -360,7 +361,7 @@ void QDeclarativeRadio::scanDown()
 }
 
 /*!
-    \qmlmethod Radio::scanUp()
+    \qmlmethod QtMultimedia5::Radio::scanUp()
 
     Searches forward in the frequency range for the current band.
  */
@@ -370,7 +371,7 @@ void QDeclarativeRadio::scanUp()
 }
 
 /*!
-    \qmlmethod Radio::searchAllStations(enumeration searchMode)
+    \qmlmethod QtMultimedia5::Radio::searchAllStations(enumeration searchMode)
 
     Start searching the complete frequency range for the current band, and save all the
     radio stations found. The search mode can be either of the values described in the
@@ -429,7 +430,7 @@ void QDeclarativeRadio::searchAllStations(QDeclarativeRadio::SearchMode searchMo
 }
 
 /*!
-    \qmlmethod Radio::tuneDown()
+    \qmlmethod QtMultimedia5::Radio::tuneDown()
 
     Decrements the frequency by the frequency step for the current band. If the frequency is already set
     to the minimum frequency, calling this function has no effect.
@@ -444,7 +445,7 @@ void QDeclarativeRadio::tuneDown()
 }
 
 /*!
-    \qmlmethod Radio::tuneUp()
+    \qmlmethod QtMultimedia5::Radio::tuneUp()
 
     Increments the frequency by the frequency step for the current band. If the frequency is already set
     to the maximum frequency, calling this function has no effect.
@@ -459,7 +460,7 @@ void QDeclarativeRadio::tuneUp()
 }
 
 /*!
-    \qmlmethod Radio::start()
+    \qmlmethod QtMultimedia5::Radio::start()
 
     Starts the radio. If the radio is available, as determined by the \l isAvailable method,
     this will result in the \l state becoming \c ActiveState.
@@ -470,7 +471,7 @@ void QDeclarativeRadio::start()
 }
 
 /*!
-    \qmlmethod Radio::stop()
+    \qmlmethod QtMultimedia5::Radio::stop()
 
     Stops the radio. After calling this method the \l state will be \c StoppedState.
  */
@@ -496,7 +497,7 @@ void QDeclarativeRadio::_q_error(QRadioTuner::Error errorCode)
 }
 
 /*!
-    \qmlsignal Radio::stationFound(int frequency, string stationId)
+    \qmlsignal QtMultimedia5::Radio::stationFound(int frequency, string stationId)
 
     This signal is emitted when a new radio station is found. This signal is only emitted
     if \l searchAllStations is called with \c SearchGetStationId.
diff --git a/src/imports/multimedia/qdeclarativeradiodata.cpp b/src/imports/multimedia/qdeclarativeradiodata.cpp
index 78b064fcd..c9aa9f8d0 100644
--- a/src/imports/multimedia/qdeclarativeradiodata.cpp
+++ b/src/imports/multimedia/qdeclarativeradiodata.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass RadioData QDeclarativeRadioData
+    \inqmlmodule QtMultimedia 5
     \brief The RadioData element allows you to access RDS data from a QML application.
     \ingroup multimedia_qml
     \inherits Item
@@ -119,7 +120,7 @@ QDeclarativeRadioData::~QDeclarativeRadioData()
 }
 
 /*!
-    \qmlmethod bool RadioData::isAvailable()
+    \qmlmethod bool QtMultimedia5::RadioData::isAvailable()
 
     Returns whether the radio data element is ready to use.
   */
@@ -129,7 +130,7 @@ bool QDeclarativeRadioData::isAvailable() const
 }
 
 /*!
-    \qmlproperty string RadioData::stationId
+    \qmlproperty string QtMultimedia5::RadioData::stationId
 
     This property allows you to read the station Id of the currently tuned radio
     station.
@@ -140,7 +141,7 @@ QString QDeclarativeRadioData::stationId() const
 }
 
 /*!
-    \qmlproperty enumeration RadioData::programType
+    \qmlproperty enumeration QtMultimedia5::RadioData::programType
 
     This property holds the type of the currently playing program as transmitted
     by the radio station. The value can be any one of the values defined in the
@@ -205,7 +206,7 @@ QDeclarativeRadioData::ProgramType QDeclarativeRadioData::programType() const
 }
 
 /*!
-    \qmlproperty string RadioData::programTypeName
+    \qmlproperty string QtMultimedia5::RadioData::programTypeName
 
     This property holds a string representation of the \l programType.
   */
@@ -215,7 +216,7 @@ QString QDeclarativeRadioData::programTypeName() const
 }
 
 /*!
-    \qmlproperty string RadioData::stationName
+    \qmlproperty string QtMultimedia5::RadioData::stationName
 
     This property has the name of the currently tuned radio station.
   */
@@ -225,7 +226,7 @@ QString QDeclarativeRadioData::stationName() const
 }
 
 /*!
-    \qmlproperty string RadioData::radioText
+    \qmlproperty string QtMultimedia5::RadioData::radioText
 
     This property holds free-text transmitted by the radio station. This is typically used to
     show supporting information for the currently playing content, for instance song title or
@@ -237,7 +238,7 @@ QString QDeclarativeRadioData::radioText() const
 }
 
 /*!
-    \qmlproperty bool RadioData::alternativeFrequenciesEnabled
+    \qmlproperty bool QtMultimedia5::RadioData::alternativeFrequenciesEnabled
 
     This property allows you to specify whether the radio should try and tune to alternative
     frequencies if the signal strength of the current station becomes too weak. The alternative
diff --git a/src/imports/multimedia/qdeclarativetorch.cpp b/src/imports/multimedia/qdeclarativetorch.cpp
index d2830fe9a..4ae985c93 100644
--- a/src/imports/multimedia/qdeclarativetorch.cpp
+++ b/src/imports/multimedia/qdeclarativetorch.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Torch QDeclarativeTorch
+    \inqmlmodule QtMultimedia 5
     \brief The Torch element provides simple control over torch functionality
 
     \ingroup multimedia_qml
@@ -90,7 +91,7 @@ QDeclarativeTorch::~QDeclarativeTorch()
 }
 
 /*!
-    \qmlproperty bool Torch::enabled
+    \qmlproperty bool QtMultimedia5::Torch::enabled
     \property QDeclarativeTorch::enabled
 
     Whether the torch is on.  If the torch functionality is shared
@@ -137,7 +138,7 @@ void QDeclarativeTorch::setEnabled(bool on)
 }
 
 /*!
-    \qmlproperty int Torch::power
+    \qmlproperty int QtMultimedia5::Torch::power
     \property QDeclarativeTorch::power
 
     The current torch power setting, as a percentage of full power.
diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp
index 58a2c8191..e56c167ce 100644
--- a/src/imports/multimedia/qdeclarativevideooutput.cpp
+++ b/src/imports/multimedia/qdeclarativevideooutput.cpp
@@ -123,6 +123,7 @@ private:
     \brief The VideoOutput element allows you to render video or camera viewfinder.
 
     \ingroup multimedia_qml
+    \inqmlmodule QtMultimedia 5
 
     This element is part of the \bold{QtMultimedia 5.0} module.
 
@@ -201,7 +202,7 @@ QDeclarativeVideoOutput::~QDeclarativeVideoOutput()
 }
 
 /*!
-    \qmlproperty variant VideoOutput::source
+    \qmlproperty variant QtMultimedia5::VideoOutput::source
 
     This property holds the source item providing the video frames like MediaPlayer or Camera.
 
@@ -338,7 +339,7 @@ static inline int qNormalizedOrientation(int o)
 }
 
 /*!
-    \qmlproperty enumeration VideoOutput::fillMode
+    \qmlproperty enumeration QtMultimedia5::VideoOutput::fillMode
 
     Set this property to define how the video is scaled to fit the target area.
 
@@ -445,7 +446,7 @@ void QDeclarativeVideoOutput::_q_updateGeometry()
         emit contentRectChanged();
 }
 /*!
-    \qmlproperty int VideoOutput::orientation
+    \qmlproperty int QtMultimedia5::VideoOutput::orientation
 
     In some cases the source video stream requires a certain
     orientation to be correct.  This includes
@@ -506,7 +507,7 @@ void QDeclarativeVideoOutput::setOrientation(int orientation)
 }
 
 /*!
-    \qmlproperty rectangle VideoOutput::contentRect
+    \qmlproperty rectangle QtMultimedia5::VideoOutput::contentRect
 
     This property holds the item coordinates of the area that
     would contain video to render.  With certain fill modes,
@@ -527,7 +528,7 @@ QRectF QDeclarativeVideoOutput::contentRect() const
 }
 
 /*!
-    \qmlproperty rectangle VideoOutput::sourceRect
+    \qmlproperty rectangle QtMultimedia5::VideoOutput::sourceRect
 
     This property holds the area of the source video
     content that is considered for rendering.  The
@@ -550,7 +551,7 @@ QRectF QDeclarativeVideoOutput::sourceRect() const
 }
 
 /*!
-    \qmlmethod mapNormalizedPointToItem
+    \qmlmethod QtMultimedia5::VideoOutput::mapNormalizedPointToItem
 
     Given normalized coordinates \a point (that is, each
     component in the range of 0 to 1.0), return the mapped point
@@ -587,7 +588,7 @@ QPointF QDeclarativeVideoOutput::mapNormalizedPointToItem(const QPointF &point)
 }
 
 /*!
-    \qmlmethod mapNormalizedRectToItem
+    \qmlmethod QtMultimedia5::VideoOutput::mapNormalizedRectToItem
 
     Given a rectangle \a rectangle in normalized
     coordinates (that is, each component in the range of 0 to 1.0),
@@ -604,7 +605,7 @@ QRectF QDeclarativeVideoOutput::mapNormalizedRectToItem(const QRectF &rectangle)
 }
 
 /*!
-    \qmlmethod mapPointToItem
+    \qmlmethod QtMultimedia5::VideoOutput::mapPointToItem
 
     Given a point \a point in item coordinates, return the
     corresponding point in source coordinates.  This mapping is
@@ -624,7 +625,7 @@ QPointF QDeclarativeVideoOutput::mapPointToSource(const QPointF &point) const
 }
 
 /*!
-    \qmlmethod mapRectToSource
+    \qmlmethod QtMultimedia5::VideoOutput::mapRectToSource
 
     Given a rectangle \a rectangle in item coordinates, return the
     corresponding rectangle in source coordinates.  This mapping is
@@ -642,7 +643,7 @@ QRectF QDeclarativeVideoOutput::mapRectToSource(const QRectF &rectangle) const
 }
 
 /*!
-    \qmlmethod mapPointToItemNormalized
+    \qmlmethod QtMultimedia5::VideoOutput::mapPointToItemNormalized
 
     Given a point \a point in item coordinates, return the
     corresponding point in normalized source coordinates.  This mapping is
@@ -677,7 +678,7 @@ QPointF QDeclarativeVideoOutput::mapPointToSourceNormalized(const QPointF &point
 }
 
 /*!
-    \qmlmethod mapRectToSourceNormalized
+    \qmlmethod QtMultimedia5::VideoOutput::mapRectToSourceNormalized
 
     Given a rectangle \a rectangle in item coordinates, return the
     corresponding rectangle in normalized source coordinates.  This mapping is
@@ -695,7 +696,7 @@ QRectF QDeclarativeVideoOutput::mapRectToSourceNormalized(const QRectF &rectangl
 }
 
 /*!
-    \qmlmethod mapPointToItem
+    \qmlmethod QtMultimedia5::VideoOutput::mapPointToItem
 
     Given a point \a point in source coordinates, return the
     corresponding point in item coordinates.  This mapping is
@@ -718,7 +719,7 @@ QPointF QDeclarativeVideoOutput::mapPointToItem(const QPointF &point) const
 }
 
 /*!
-    \qmlmethod mapRectToItem
+    \qmlmethod QtMultimedia5::VideoOutput::mapRectToItem
 
     Given a rectangle \a rectangle in source coordinates, return the
     corresponding rectangle in item coordinates.  This mapping is