Fix a number of other qdoc issues.

* Several places needed the forward class declaration hack
* Missing/wrong minor version numbers on imports
* A few typos
* Any number of attempts to work around qdoc
* A few missing docs
* Tweaked soundeffect docs

Change-Id: I3c2ab998a11cbb0956712e0423e01fdb70f5bfff
Reviewed-by: Peter Yard <peter.yard@nokia.com>
Reviewed-by: Angus Cummings <angus.cummings@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>

21 files changed, 211 insertions, 233 deletions

diff --git a/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp b/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp
index e1a4ac004..00521f5f8 100644
--- a/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp
+++ b/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp
@@ -91,9 +91,9 @@ void QDeclarativeAttenuationModel::setName(const QString& name)
 //////////////////////////////////////////////////////////////////////////////////////////
 /*!
     \qmlclass AttenuationModelLinear QDeclarativeAttenuationModelLinear
-    \since 5.0
+    \since 1.0
     \brief Defines a linear attenuation curve for a \l Sound.
-    \inqmlmodule QtAudioEngine 1
+    \inqmlmodule QtAudioEngine 1.0
     \ingroup multimedia_audioengine
     \inherits Item
     \preliminary
@@ -222,9 +222,10 @@ qreal QDeclarativeAttenuationModelLinear::calculateGain(const QVector3D &listene
 //////////////////////////////////////////////////////////////////////////////////////////
 /*!
     \qmlclass AttenuationModelInverse QDeclarativeAttenuationModelInverse
-    \since 5.0
+
+    \since 1.0
     \brief Defines a non-linear attenuation curve for a \l Sound.
-    \inmodule QtMultimedia
+    \inqmlmodule QtAudioEngine 1.0
     \ingroup multimedia_audioengine
     \inherits Item
     \preliminary
diff --git a/src/imports/audioengine/qdeclarative_audiocategory_p.cpp b/src/imports/audioengine/qdeclarative_audiocategory_p.cpp
index 1c78bd8bd..223175a1d 100644
--- a/src/imports/audioengine/qdeclarative_audiocategory_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audiocategory_p.cpp
@@ -48,9 +48,9 @@ QT_USE_NAMESPACE
 
 /*!
     \qmlclass AudioCategory QDeclarativeAudioCategory
-    \since 5.0
+    \since 1.0
     \brief Control all active sound instances by group.
-    \inqmlmodule QtAudioEngine 1
+    \inqmlmodule QtAudioEngine 1.0
     \ingroup multimedia_audioengine
     \inherits Item
     \preliminary
diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.cpp b/src/imports/audioengine/qdeclarative_audioengine_p.cpp
index 58259e1e9..fa021775d 100644
--- a/src/imports/audioengine/qdeclarative_audioengine_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audioengine_p.cpp
@@ -57,9 +57,9 @@ QT_USE_NAMESPACE
 
 /*!
     \qmlclass AudioEngine QDeclarativeAudioEngine
-    \since 5.0
+    \since 1.0
     \brief Organize all your 3d audio content in one place.
-    \inqmlmodule QtAudioEngine 1
+    \inqmlmodule QtAudioEngine 1.0
     \ingroup multimedia_audioengine
     \inherits Item
     \preliminary
diff --git a/src/imports/audioengine/qdeclarative_audiolistener_p.cpp b/src/imports/audioengine/qdeclarative_audiolistener_p.cpp
index 55ba0b212..91816b038 100644
--- a/src/imports/audioengine/qdeclarative_audiolistener_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audiolistener_p.cpp
@@ -49,9 +49,9 @@ QT_USE_NAMESPACE
 
 /*!
     \qmlclass AudioListener QDeclarativeAudioListener
-    \since 5.0
+    \since 1.0
     \brief Control global listener parameters.
-    \inqmlmodule QtAudioEngine 1
+    \inqmlmodule QtAudioEngine 1.0
     \ingroup multimedia_audioengine
     \inherits Item
     \preliminary
diff --git a/src/imports/audioengine/qdeclarative_audiosample_p.cpp b/src/imports/audioengine/qdeclarative_audiosample_p.cpp
index 80b33025e..9c98f2eeb 100644
--- a/src/imports/audioengine/qdeclarative_audiosample_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audiosample_p.cpp
@@ -51,9 +51,9 @@ QT_USE_NAMESPACE
 
 /*!
     \qmlclass AudioSample QDeclarativeAudioSample
-    \since 5.0
+    \since 1.0
     \brief Load audio samples, mostly .wav.
-    \inqmlmodule QtAudioEngine 1
+    \inqmlmodule QtAudioEngine 1.0
     \ingroup multimedia_audioengine
     \inherits Item
     \preliminary
diff --git a/src/imports/audioengine/qdeclarative_playvariation_p.cpp b/src/imports/audioengine/qdeclarative_playvariation_p.cpp
index 64bac1e20..3f78ce048 100644
--- a/src/imports/audioengine/qdeclarative_playvariation_p.cpp
+++ b/src/imports/audioengine/qdeclarative_playvariation_p.cpp
@@ -50,12 +50,12 @@ QT_USE_NAMESPACE
 
 /*!
     \qmlclass PlayVariation QDeclarativePlayVariation
-    \since 5.0
+    \since 1.0
     \brief Define a playback variation for \l {Sound} {sounds}.
     So each time the playback of the same sound can be a slightly different even with the same
     AudioSample.
 
-    \inqmlmodule QtAudioEngine 1
+    \inqmlmodule QtAudioEngine 1.0
     \ingroup multimedia_audioengine
     \inherits Item
     \preliminary
diff --git a/src/imports/audioengine/qdeclarative_sound_p.cpp b/src/imports/audioengine/qdeclarative_sound_p.cpp
index ca9ae10ce..22eb4e3a8 100644
--- a/src/imports/audioengine/qdeclarative_sound_p.cpp
+++ b/src/imports/audioengine/qdeclarative_sound_p.cpp
@@ -139,10 +139,10 @@ void QDeclarativeSoundCone::componentComplete()
 ////////////////////////////////////////////////////////////
 /*!
     \qmlclass Sound QDeclarativeSound
-    \since 5.0
+    \since 1.0
     \brief Define a variety of samples and parameters to be used for
     SoundInstance.
-    \inqmlmodule QtAudioEngine 1
+    \inqmlmodule QtAudioEngine 1.0
     \ingroup multimedia_audioengine
     \inherits Item
     \preliminary
diff --git a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp
index 2bdc6a69f..241a79b96 100644
--- a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp
+++ b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp
@@ -52,9 +52,9 @@ QT_USE_NAMESPACE
 
 /*!
     \qmlclass SoundInstance QDeclarativeSoundInstance
-    \since 5.0
+    \since 1.0
     \brief Play 3d audio content.
-    \inqmlmodule QtAudioEngine 1
+    \inqmlmodule QtAudioEngine 1.0
     \ingroup multimedia_audioengine
     \inherits Item
     \preliminary
diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml
index 50437063b..dc901e73c 100644
--- a/src/imports/multimedia/Video.qml
+++ b/src/imports/multimedia/Video.qml
@@ -47,6 +47,7 @@ import QtMultimedia 5.0
     \inherits Item
     \ingroup multimedia_qml
     \ingroup multimedia_video_qml
+    \inqmlmodule QtMultimedia 5.0
     \brief A convenience type for showing a specified video.
 
     \c Video is a convenience type combining the functionality
@@ -392,11 +393,20 @@ Item {
 // ***************************************
 
 /*!
+    \qmlproperty variant Video::metaData
+
+    This property holds a collection of all the meta-data for the media.
+
+    You can access individual properties like \l {Video::metaData.title}{metaData.title}
+    or \l {Video::metaData.trackNumber} {metaData.trackNumber}.
+*/
+
+/*!
     \qmlproperty variant Video::metaData.title
 
     This property holds the title of the media.
 
-    \sa {QtMultimedia::MetaData::Title}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -404,7 +414,7 @@ Item {
 
     This property holds the sub-title of the media.
 
-    \sa {QtMultimedia::MetaData::SubTitle}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -412,7 +422,7 @@ Item {
 
     This property holds the author of the media.
 
-    \sa {QtMultimedia::MetaData::Author}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -420,7 +430,7 @@ Item {
 
     This property holds a user comment about the media.
 
-    \sa {QtMultimedia::MetaData::Comment}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -428,7 +438,7 @@ Item {
 
     This property holds a description of the media.
 
-    \sa {QtMultimedia::MetaData::Description}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -436,7 +446,7 @@ Item {
 
     This property holds the category of the media
 
-    \sa {QtMultimedia::MetaData::Category}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -444,7 +454,7 @@ Item {
 
     This property holds the genre of the media.
 
-    \sa {QtMultimedia::MetaData::Genre}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -452,7 +462,7 @@ Item {
 
     This property holds the year of release of the media.
 
-    \sa {QtMultimedia::MetaData::Year}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -460,7 +470,7 @@ Item {
 
     This property holds the date of the media.
 
-    \sa {QtMultimedia::MetaData::Date}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -468,7 +478,7 @@ Item {
 
     This property holds a user rating of the media in the range of 0 to 100.
 
-    \sa {QtMultimedia::MetaData::UserRating}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -476,7 +486,7 @@ Item {
 
     This property holds a list of keywords describing the media.
 
-    \sa {QtMultimedia::MetaData::Keywords}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -484,7 +494,7 @@ Item {
 
     This property holds the language of the media, as an ISO 639-2 code.
 
-    \sa {QtMultimedia::MetaData::Language}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -492,7 +502,7 @@ Item {
 
     This property holds the publisher of the media.
 
-    \sa {QtMultimedia::MetaData::Publisher}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -500,7 +510,7 @@ Item {
 
     This property holds the media's copyright notice.
 
-    \sa {QtMultimedia::MetaData::Copyright}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -508,7 +518,7 @@ Item {
 
     This property holds the parental rating of the media.
 
-    \sa {QtMultimedia::MetaData::ParentalRating}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -517,7 +527,7 @@ Item {
     This property holds the name of the rating organization responsible for the
     parental rating of the media.
 
-    \sa {QtMultimedia::MetaData::RatingOrganization}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -525,7 +535,7 @@ Item {
 
     This property property holds the size of the media in bytes.
 
-    \sa {QtMultimedia::MetaData::Size}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -533,7 +543,7 @@ Item {
 
     This property holds the type of the media.
 
-    \sa {QtMultimedia::MetaData::MediaType}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -542,7 +552,7 @@ Item {
     This property holds the bit rate of the media's audio stream in bits per
     second.
 
-    \sa {QtMultimedia::MetaData::AudioBitRate}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -550,7 +560,7 @@ Item {
 
     This property holds the encoding of the media audio stream.
 
-    \sa {QtMultimedia::MetaData::AudioCodec}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -558,7 +568,7 @@ Item {
 
     This property holds the average volume level of the media.
 
-    \sa {QtMultimedia::MetaData::AverageLevel}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -566,7 +576,7 @@ Item {
 
     This property holds the number of channels in the media's audio stream.
 
-    \sa {QtMultimedia::MetaData::ChannelCount}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -574,7 +584,7 @@ Item {
 
     This property holds the peak volume of the media's audio stream.
 
-    \sa {QtMultimedia::MetaData::PeakValue}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -582,7 +592,7 @@ Item {
 
     This property holds the sample rate of the media's audio stream in Hertz.
 
-    \sa {QtMultimedia::MetaData::SampleRate}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -590,7 +600,7 @@ Item {
 
     This property holds the title of the album the media belongs to.
 
-    \sa {QtMultimedia::MetaData::AlbumTitle}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -599,7 +609,7 @@ Item {
     This property holds the name of the principal artist of the album the media
     belongs to.
 
-    \sa {QtMultimedia::MetaData::AlbumArtist}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -607,7 +617,7 @@ Item {
 
     This property holds the names of artists contributing to the media.
 
-    \sa {QtMultimedia::MetaData::ContributingArtist}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -615,7 +625,7 @@ Item {
 
     This property holds the composer of the media.
 
-    \sa {QtMultimedia::MetaData::Composer}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -623,7 +633,7 @@ Item {
 
     This property holds the conductor of the media.
 
-    \sa {QtMultimedia::MetaData::Conductor}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -631,7 +641,7 @@ Item {
 
     This property holds the lyrics to the media.
 
-    \sa {QtMultimedia::MetaData::Lyrics}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -639,7 +649,7 @@ Item {
 
     This property holds the mood of the media.
 
-    \sa {QtMultimedia::MetaData::Mood}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -647,7 +657,7 @@ Item {
 
     This property holds the track number of the media.
 
-    \sa {QtMultimedia::MetaData::TrackNumber}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -655,7 +665,7 @@ Item {
 
     This property holds the number of track on the album containing the media.
 
-    \sa {QtMultimedia::MetaData::TrackNumber}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -663,7 +673,7 @@ Item {
 
     This property holds the URL of a small cover art image.
 
-    \sa {QtMultimedia::MetaData::CoverArtUrlSmall}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -671,7 +681,7 @@ Item {
 
     This property holds the URL of a large cover art image.
 
-    \sa {QtMultimedia::MetaData::CoverArtUrlLarge}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -679,7 +689,7 @@ Item {
 
     This property holds the dimension of an image or video.
 
-    \sa {QtMultimedia::MetaData::Resolution}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -687,7 +697,7 @@ Item {
 
     This property holds the pixel aspect ratio of an image or video.
 
-    \sa {QtMultimedia::MetaData::PixelAspectRatio}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -695,7 +705,7 @@ Item {
 
     This property holds the frame rate of the media's video stream.
 
-    \sa {QtMultimedia::MetaData::VideoFrameRate}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -704,7 +714,7 @@ Item {
     This property holds the bit rate of the media's video stream in bits per
     second.
 
-    \sa {QtMultimedia::MetaData::VideoBitRate}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -712,7 +722,7 @@ Item {
 
     This property holds the encoding of the media's video stream.
 
-    \sa {QtMultimedia::MetaData::VideoCodec}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -720,7 +730,7 @@ Item {
 
     This property holds the URL of a poster image.
 
-    \sa {QtMultimedia::MetaData::PosterUrl}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -728,7 +738,7 @@ Item {
 
     This property holds the chapter number of the media.
 
-    \sa {QtMultimedia::MetaData::ChapterNumber}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -736,7 +746,7 @@ Item {
 
     This property holds the director of the media.
 
-    \sa {QtMultimedia::MetaData::Director}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -744,7 +754,7 @@ Item {
 
     This property holds the lead performer in the media.
 
-    \sa {QtMultimedia::MetaData::LeadPerformer}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -752,7 +762,7 @@ Item {
 
     This property holds the writer of the media.
 
-    \sa {QtMultimedia::MetaData::Writer}
+    \sa {QtMultimedia::MetaData}
 */
 
 // The remaining properties are related to photos, and are technically
@@ -761,115 +771,115 @@ Item {
 /*!
     \qmlproperty variant Video::metaData.cameraManufacturer
 
-    \sa {QtMultimedia::MetaData::CameraManufacturer}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.cameraModel
 
-    \sa {QtMultimedia::MetaData::CameraModel}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.event
 
-    \sa {QtMultimedia::MetaData::Event}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.subject
 
-    \sa {QtMultimedia::MetaData::Subject}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.orientation
 
-    \sa {QtMultimedia::MetaData::Orientation}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureTime
 
-    \sa {QtMultimedia::MetaData::ExposureTime}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.fNumber
 
-    \sa {QtMultimedia::MetaData::FNumber}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureProgram
 
-    \sa {QtMultimedia::MetaData::ExposureProgram}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.isoSpeedRatings
 
-    \sa {QtMultimedia::MetaData::ISOSpeedRatings}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureBiasValue
 
-    \sa {QtMultimedia::MetaData::ExposureBiasValue}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.dateTimeDigitized
 
-    \sa {QtMultimedia::MetaData::DateTimeDigitized}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.subjectDistance
 
-    \sa {QtMultimedia::MetaData::SubjectDistance}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.meteringMode
 
-    \sa {QtMultimedia::MetaData::MeteringMode}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.lightSource
 
-    \sa {QtMultimedia::MetaData::LightSource}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.flash
 
-    \sa {QtMultimedia::MetaData::Flash}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.focalLength
 
-    \sa {QtMultimedia::MetaData::FocalLength}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureMode
 
-    \sa {QtMultimedia::MetaData::ExposureMode}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.whiteBalance
 
-    \sa {QtMultimedia::MetaData::WhiteBalance}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.DigitalZoomRatio
 
-    \sa {QtMultimedia::MetaData::DigitalZoomRatio}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -881,36 +891,36 @@ Item {
 /*!
     \qmlproperty variant Video::metaData.sceneCaptureType
 
-    \sa {QtMultimedia::MetaData::SceneCaptureType}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.gainControl
 
-    \sa {QtMultimedia::MetaData::GainControl}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.contrast
 
-    \sa {QtMultimedia::MetaData::contrast}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.saturation
 
-    \sa {QtMultimedia::MetaData::Saturation}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.sharpness
 
-    \sa {QtMultimedia::MetaData::Sharpness}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.deviceSettingDescription
 
-    \sa {QtMultimedia::MetaData::DeviceSettingDescription}
+    \sa {QtMultimedia::MetaData}
 */
 
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 39790c6f4..aaf43febd 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
     \qmlclass Audio QDeclarativeAudio
     \brief Add audio playback to a scene.
 
-    \inqmlmodule QtMultimedia 5
+    \inqmlmodule QtMultimedia 5.0
     \ingroup multimedia_qml
     \ingroup multimedia_audio_qml
 
@@ -754,9 +754,9 @@ void QDeclarativeAudio::_q_statusChanged()
 /*!
     \qmlproperty variant QtMultimedia5::Audio::metaData.title
 
-    This property holds the tile of the media.
+    This property holds the title of the media.
 
-    \sa {QtMultimedia::MetaData::Title}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -764,7 +764,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the sub-title of the media.
 
-    \sa {QtMultimedia::MetaData::SubTitle}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -772,7 +772,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the author of the media.
 
-    \sa {QtMultimedia::MetaData::Author}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -780,7 +780,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a user comment about the media.
 
-    \sa {QtMultimedia::MetaData::Comment}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -788,7 +788,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a description of the media.
 
-    \sa {QtMultimedia::MetaData::Description}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -796,7 +796,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the category of the media
 
-    \sa {QtMultimedia::MetaData::Category}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -804,7 +804,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the genre of the media.
 
-    \sa {QtMultimedia::MetaData::Genre}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -812,7 +812,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the year of release of the media.
 
-    \sa {QtMultimedia::MetaData::Year}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -820,7 +820,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the date of the media.
 
-    \sa {QtMultimedia::MetaData::Date}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -828,7 +828,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a user rating of the media in the range of 0 to 100.
 
-    \sa {QtMultimedia::MetaData::UserRating}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -836,7 +836,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a list of keywords describing the media.
 
-    \sa {QtMultimedia::MetaData::Keywords}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -844,7 +844,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the language of the media, as an ISO 639-2 code.
 
-    \sa {QtMultimedia::MetaData::Language}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -852,7 +852,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the publisher of the media.
 
-    \sa {QtMultimedia::MetaData::Publisher}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -860,7 +860,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the media's copyright notice.
 
-    \sa {QtMultimedia::MetaData::Copyright}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -868,7 +868,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the parental rating of the media.
 
-    \sa {QtMultimedia::MetaData::ParentalRating}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -877,7 +877,7 @@ void QDeclarativeAudio::_q_statusChanged()
     This property holds the name of the rating organization responsible for the
     parental rating of the media.
 
-    \sa {QtMultimedia::MetaData::RatingOrganization}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -885,7 +885,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property property holds the size of the media in bytes.
 
-    \sa {QtMultimedia::MetaData::Size}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -893,7 +893,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the type of the media.
 
-    \sa {QtMultimedia::MetaData::MediaType}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -902,7 +902,7 @@ void QDeclarativeAudio::_q_statusChanged()
     This property holds the bit rate of the media's audio stream in bits per
     second.
 
-    \sa {QtMultimedia::MetaData::AudioBitRate}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -910,7 +910,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the encoding of the media audio stream.
 
-    \sa {QtMultimedia::MetaData::AudioCodec}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -918,7 +918,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the average volume level of the media.
 
-    \sa {QtMultimedia::MetaData::AverageLevel}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -926,7 +926,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the number of channels in the media's audio stream.
 
-    \sa {QtMultimedia::MetaData::ChannelCount}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -934,7 +934,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the peak volume of media's audio stream.
 
-    \sa {QtMultimedia::MetaData::PeakValue}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -942,7 +942,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the sample rate of the media's audio stream in hertz.
 
-    \sa {QtMultimedia::MetaData::SampleRate}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -950,7 +950,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the title of the album the media belongs to.
 
-    \sa {QtMultimedia::MetaData::AlbumTitle}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -959,7 +959,7 @@ void QDeclarativeAudio::_q_statusChanged()
     This property holds the name of the principal artist of the album the media
     belongs to.
 
-    \sa {QtMultimedia::MetaData::AlbumArtist}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -967,7 +967,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the names of artists contributing to the media.
 
-    \sa {QtMultimedia::MetaData::ContributingArtist}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -975,7 +975,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the composer of the media.
 
-    \sa {QtMultimedia::MetaData::Composer}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -983,7 +983,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the conductor of the media.
 
-    \sa {QtMultimedia::MetaData::Conductor}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -991,7 +991,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the lyrics to the media.
 
-    \sa {QtMultimedia::MetaData::Lyrics}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -999,7 +999,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the mood of the media.
 
-    \sa {QtMultimedia::MetaData::Mood}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1007,7 +1007,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the track number of the media.
 
-    \sa {QtMultimedia::MetaData::TrackNumber}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1015,7 +1015,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the number of tracks on the album containing the media.
 
-    \sa {QtMultimedia::MetaData::TrackNumber}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1023,7 +1023,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the URL of a small cover art image.
 
-    \sa {QtMultimedia::MetaData::CoverArtUrlSmall}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1031,7 +1031,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the URL of a large cover art image.
 
-    \sa {QtMultimedia::MetaData::CoverArtUrlLarge}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1039,7 +1039,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the dimension of an image or video.
 
-    \sa {QtMultimedia::MetaData::Resolution}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1047,7 +1047,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the pixel aspect ratio of an image or video.
 
-    \sa {QtMultimedia::MetaData::PixelAspectRatio}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1055,7 +1055,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the frame rate of the media's video stream.
 
-    \sa {QtMultimedia::MetaData::VideoFrameRate}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1064,7 +1064,7 @@ void QDeclarativeAudio::_q_statusChanged()
     This property holds the bit rate of the media's video stream in bits per
     second.
 
-    \sa {QtMultimedia::MetaData::VideoBitRate}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1072,7 +1072,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the encoding of the media's video stream.
 
-    \sa {QtMultimedia::MetaData::VideoCodec}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1080,7 +1080,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the URL of a poster image.
 
-    \sa {QtMultimedia::MetaData::PosterUrl}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1088,7 +1088,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the chapter number of the media.
 
-    \sa {QtMultimedia::MetaData::ChapterNumber}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1096,7 +1096,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the director of the media.
 
-    \sa {QtMultimedia::MetaData::Director}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1104,7 +1104,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the lead performer in the media.
 
-    \sa {QtMultimedia::MetaData::LeadPerformer}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1112,7 +1112,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the writer of the media.
 
-    \sa {QtMultimedia::MetaData::Writer}
+    \sa {QtMultimedia::MetaData}
 */
 
 ///////////// MediaPlayer Docs /////////////
@@ -1121,7 +1121,7 @@ void QDeclarativeAudio::_q_statusChanged()
     \qmlclass MediaPlayer QDeclarativeAudio
     \brief Add media playback to a scene.
 
-    \inqmlmodule QtMultimedia 5
+    \inqmlmodule QtMultimedia 5.0
     \ingroup multimedia_qml
     \ingroup multimedia_audio_qml
     \ingroup multimedia_video_qml
@@ -1200,27 +1200,6 @@ void QDeclarativeAudio::_q_statusChanged()
  */
 
 /*!
-    \qmlproperty enumeration QtMultimedia5::MediaPlayer::availability
-
-    Returns the availability state of the media player.
-
-    This is one of:
-    \table
-    \header \li Value \li Description
-    \row \li Available
-        \li The media player is available to use.
-    \row \li Busy
-        \li The media player is usually available, but some other
-           process is utilizing the hardware necessary to play media.
-    \row \li Unavailable
-        \li There are no supported media playback facilities.
-    \row \li ResourceMissing
-        \li There is one or more resources missing, so the media player cannot
-           be used.  It may be possible to try again at a later time.
-    \endtable
- */
-
-/*!
     \qmlmethod QtMultimedia5::MediaPlayer::play()
 
     Starts playback of the media.
@@ -1442,9 +1421,9 @@ void QDeclarativeAudio::_q_statusChanged()
 /*!
     \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.title
 
-    This property holds the tile of the media.
+    This property holds the title of the media.
 
-    \sa {QtMultimedia::MetaData::Title}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1452,7 +1431,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the sub-title of the media.
 
-    \sa {QtMultimedia::MetaData::SubTitle}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1460,7 +1439,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the author of the media.
 
-    \sa {QtMultimedia::MetaData::Author}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1468,7 +1447,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a user comment about the media.
 
-    \sa {QtMultimedia::MetaData::Comment}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1476,7 +1455,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a description of the media.
 
-    \sa {QtMultimedia::MetaData::Description}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1484,7 +1463,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the category of the media
 
-    \sa {QtMultimedia::MetaData::Category}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1492,7 +1471,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the genre of the media.
 
-    \sa {QtMultimedia::MetaData::Genre}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1500,7 +1479,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the year of release of the media.
 
-    \sa {QtMultimedia::MetaData::Year}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1508,7 +1487,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the date of the media.
 
-    \sa {QtMultimedia::MetaData::Date}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1516,7 +1495,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a user rating of the media in the range of 0 to 100.
 
-    \sa {QtMultimedia::MetaData::UserRating}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1524,7 +1503,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a list of keywords describing the media.
 
-    \sa {QtMultimedia::MetaData::Keywords}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1532,7 +1511,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the language of the media, as an ISO 639-2 code.
 
-    \sa {QtMultimedia::MetaData::Language}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1540,7 +1519,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the publisher of the media.
 
-    \sa {QtMultimedia::MetaData::Publisher}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1548,7 +1527,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the media's copyright notice.
 
-    \sa {QtMultimedia::MetaData::Copyright}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1556,7 +1535,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the parental rating of the media.
 
-    \sa {QtMultimedia::MetaData::ParentalRating}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1565,7 +1544,7 @@ void QDeclarativeAudio::_q_statusChanged()
     This property holds the name of the rating organization responsible for the
     parental rating of the media.
 
-    \sa {QtMultimedia::MetaData::RatingOrganization}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1573,7 +1552,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property property holds the size of the media in bytes.
 
-    \sa {QtMultimedia::MetaData::Size}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1581,7 +1560,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the type of the media.
 
-    \sa {QtMultimedia::MetaData::MediaType}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1590,7 +1569,7 @@ void QDeclarativeAudio::_q_statusChanged()
     This property holds the bit rate of the media's audio stream in bits per
     second.
 
-    \sa {QtMultimedia::MetaData::AudioBitRate}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1598,7 +1577,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the encoding of the media audio stream.
 
-    \sa {QtMultimedia::MetaData::AudioCodec}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1606,7 +1585,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the average volume level of the media.
 
-    \sa {QtMultimedia::MetaData::AverageLevel}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1614,7 +1593,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the number of channels in the media's audio stream.
 
-    \sa {QtMultimedia::MetaData::ChannelCount}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1622,7 +1601,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the peak volume of media's audio stream.
 
-    \sa {QtMultimedia::MetaData::PeakValue}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1630,7 +1609,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the sample rate of the media's audio stream in hertz.
 
-    \sa {QtMultimedia::MetaData::SampleRate}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1638,7 +1617,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the title of the album the media belongs to.
 
-    \sa {QtMultimedia::MetaData::AlbumTitle}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1647,7 +1626,7 @@ void QDeclarativeAudio::_q_statusChanged()
     This property holds the name of the principal artist of the album the media
     belongs to.
 
-    \sa {QtMultimedia::MetaData::AlbumArtist}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1655,7 +1634,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the names of artists contributing to the media.
 
-    \sa {QtMultimedia::MetaData::ContributingArtist}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1663,7 +1642,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the composer of the media.
 
-    \sa {QtMultimedia::MetaData::Composer}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1671,7 +1650,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the conductor of the media.
 
-    \sa {QtMultimedia::MetaData::Conductor}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1679,7 +1658,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the lyrics to the media.
 
-    \sa {QtMultimedia::MetaData::Lyrics}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1687,7 +1666,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the mood of the media.
 
-    \sa {QtMultimedia::MetaData::Mood}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1695,7 +1674,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the track number of the media.
 
-    \sa {QtMultimedia::MetaData::TrackNumber}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1703,7 +1682,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the number of tracks on the album containing the media.
 
-    \sa {QtMultimedia::MetaData::TrackNumber}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1711,7 +1690,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the URL of a small cover art image.
 
-    \sa {QtMultimedia::MetaData::CoverArtUrlSmall}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1719,7 +1698,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the URL of a large cover art image.
 
-    \sa {QtMultimedia::MetaData::CoverArtUrlLarge}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1727,7 +1706,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the dimension of an image or video.
 
-    \sa {QtMultimedia::MetaData::Resolution}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1735,7 +1714,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the pixel aspect ratio of an image or video.
 
-    \sa {QtMultimedia::MetaData::PixelAspectRatio}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1743,7 +1722,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the frame rate of the media's video stream.
 
-    \sa {QtMultimedia::MetaData::VideoFrameRate}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1752,7 +1731,7 @@ void QDeclarativeAudio::_q_statusChanged()
     This property holds the bit rate of the media's video stream in bits per
     second.
 
-    \sa {QtMultimedia::MetaData::VideoBitRate}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1760,7 +1739,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the encoding of the media's video stream.
 
-    \sa {QtMultimedia::MetaData::VideoCodec}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1768,7 +1747,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the URL of a poster image.
 
-    \sa {QtMultimedia::MetaData::PosterUrl}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1776,7 +1755,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the chapter number of the media.
 
-    \sa {QtMultimedia::MetaData::ChapterNumber}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1784,7 +1763,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the director of the media.
 
-    \sa {QtMultimedia::MetaData::Director}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1792,7 +1771,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the lead performer in the media.
 
-    \sa {QtMultimedia::MetaData::LeadPerformer}
+    \sa {QtMultimedia::MetaData}
 */
 
 /*!
@@ -1800,7 +1779,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the writer of the media.
 
-    \sa {QtMultimedia::MetaData::Writer}
+    \sa {QtMultimedia::MetaData}
 */
 
 QT_END_NAMESPACE
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index bbdccd42b..6308edc4e 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -78,7 +78,7 @@ void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityError
     \brief Access viewfinder frames, and take photos and movies.
     \ingroup multimedia_qml
     \ingroup camera_qml
-    \inqmlmodule QtMultimedia 5
+    \inqmlmodule QtMultimedia 5.0
 
     \inherits Item
 
@@ -227,6 +227,8 @@ QDeclarativeCamera::Error QDeclarativeCamera::errorCode() const
     \qmlproperty string QtMultimedia5::Camera::errorString
 
     A description of the current error, if any.
+
+    \sa QtMultimedia5::Camera::onError
 */
 QString QDeclarativeCamera::errorString() const
 {
@@ -579,15 +581,6 @@ void QDeclarativeCamera::setDigitalZoom(qreal value)
 */
 
 /*!
-    \qmlproperty string QtMultimedia5::Camera::errorString
-
-    A string describing a camera's error state.
-
-    \sa QtMultimedia5::Camera::onError
-*/
-
-
-/*!
     \qmlsignal QtMultimedia5::Camera::onError(errorCode, errorString)
 
     This handler is called when an error occurs.  The enumeration value \a errorCode is one of the
@@ -619,21 +612,21 @@ void QDeclarativeCamera::setDigitalZoom(qreal value)
 */
 
 /*!
-    \fn void QDeclarativeCamera:opticalZoomChanged(qreal zoom)
+    \fn void QDeclarativeCamera::opticalZoomChanged(qreal zoom)
     \qmlsignal Camera::opticalZoomChanged(zoom)
 
     The optical zoom setting has changed to \a zoom.
 */
 
 /*!
-    \fn void QDeclarativeCamera::digitalZoomChanged(qreal)
+    \fn void QDeclarativeCamera::digitalZoomChanged(qreal zoom)
     \qmlsignal Camera::digitalZoomChanged(zoom)
 
     The digital zoom setting has changed to \a zoom.
 */
 
 /*!
-    \fn void QDeclarativeCamera::maximumOpticalZoomChanged(zoom)
+    \fn void QDeclarativeCamera::maximumOpticalZoomChanged(qreal zoom)
     \qmlsignal Camera::maximumOpticalZoomChanged(zoom)
 
     The maximum optical zoom setting has changed to \a zoom.  This
@@ -642,7 +635,7 @@ void QDeclarativeCamera::setDigitalZoom(qreal value)
 */
 
 /*!
-    \fn void QDeclarativeCamera::maximumDigitalZoomChanged(qreal)
+    \fn void QDeclarativeCamera::maximumDigitalZoomChanged(qreal zoom)
     \qmlsignal Camera::maximumDigitalZoomChanged(zoom)
 
     The maximum digital zoom setting has changed to \a zoom.  This
diff --git a/src/imports/multimedia/qdeclarativecameracapture.cpp b/src/imports/multimedia/qdeclarativecameracapture.cpp
index f1e551214..663a805f1 100644
--- a/src/imports/multimedia/qdeclarativecameracapture.cpp
+++ b/src/imports/multimedia/qdeclarativecameracapture.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
     \qmlclass CameraCapture QDeclarativeCameraCapture
     \brief An interface for capturing camera images
     \ingroup multimedia_qml
-    \inqmlmodule QtMultimedia 5
+    \inqmlmodule QtMultimedia 5.0
     \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 d1bfe4278..d8c4f27a3 100644
--- a/src/imports/multimedia/qdeclarativecameraexposure.cpp
+++ b/src/imports/multimedia/qdeclarativecameraexposure.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
     \brief An interface for exposure related camera settings.
     \ingroup multimedia_qml
     \ingroup camera_qml
-    \inqmlmodule QtMultimedia 5
+    \inqmlmodule QtMultimedia 5.0
 
     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 da0df4c7c..2f9526ed0 100644
--- a/src/imports/multimedia/qdeclarativecameraflash.cpp
+++ b/src/imports/multimedia/qdeclarativecameraflash.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass CameraFlash QDeclarativeCameraFlash
-    \inqmlmodule QtMultimedia 5
+    \inqmlmodule QtMultimedia 5.0
     \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 bba5e3733..70a737ca1 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus.cpp
+++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass CameraFocus QDeclarativeCameraFocus
-    \inqmlmodule QtMultimedia 5
+    \inqmlmodule QtMultimedia 5.0
     \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 94c2cfef3..88e82f976 100644
--- a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
+++ b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass CameraImageProcessing QDeclarativeCameraImageProcessing
-    \inqmlmodule QtMultimedia 5
+    \inqmlmodule QtMultimedia 5.0
     \brief An interface for camera capture related settings.
     \ingroup multimedia_qml
     \ingroup camera_qml
@@ -112,11 +112,6 @@ QDeclarativeCameraImageProcessing::~QDeclarativeCameraImageProcessing()
 
     \sa manualWhiteBalance
 */
-/*!
-    \property QDeclarativeCameraImageProcessing::whiteBalanceMode
-
-    \sa WhiteBalanceMode
-*/
 QDeclarativeCameraImageProcessing::WhiteBalanceMode QDeclarativeCameraImageProcessing::whiteBalanceMode() const
 {
     return WhiteBalanceMode(m_imageProcessing->whiteBalanceMode());
diff --git a/src/imports/multimedia/qdeclarativecamerarecorder.cpp b/src/imports/multimedia/qdeclarativecamerarecorder.cpp
index 1b282ad12..48cc1e25f 100644
--- a/src/imports/multimedia/qdeclarativecamerarecorder.cpp
+++ b/src/imports/multimedia/qdeclarativecamerarecorder.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass CameraRecorder QDeclarativeCameraRecorder
-    \inqmlmodule QtMultimedia 5
+    \inqmlmodule QtMultimedia 5.0
     \brief Controls video recording with the Camera.
     \ingroup multimedia_qml
     \ingroup camera_qml
@@ -371,7 +371,7 @@ QDeclarativeCameraRecorder::Error QDeclarativeCameraRecorder::errorCode() const
 }
 
 /*!
-    \qmlproperty string QtMultimedia5::Camera::errorString
+    \qmlproperty string QtMultimedia5::CameraRecorder::errorString
 
     A description of the current error, if any.
 */
diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp
index dac7aad0e..128a9979f 100644
--- a/src/imports/multimedia/qdeclarativeradio.cpp
+++ b/src/imports/multimedia/qdeclarativeradio.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Radio QDeclarativeRadio
-    \inqmlmodule QtMultimedia 5
+    \inqmlmodule QtMultimedia 5.0
     \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 a72325e52..76cae0fc0 100644
--- a/src/imports/multimedia/qdeclarativeradiodata.cpp
+++ b/src/imports/multimedia/qdeclarativeradiodata.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass RadioData QDeclarativeRadioData
-    \inqmlmodule QtMultimedia 5
+    \inqmlmodule QtMultimedia 5.0
     \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 64b6b4c69..743877347 100644
--- a/src/imports/multimedia/qdeclarativetorch.cpp
+++ b/src/imports/multimedia/qdeclarativetorch.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Torch QDeclarativeTorch
-    \inqmlmodule QtMultimedia 5
+    \inqmlmodule QtMultimedia 5.0
     \brief Simple control over torch functionality
 
     \ingroup multimedia_qml
diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp
index 3e4aa891d..fc996f453 100644
--- a/src/imports/multimedia/qdeclarativevideooutput.cpp
+++ b/src/imports/multimedia/qdeclarativevideooutput.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 
     \ingroup multimedia_qml
     \ingroup multimedia_video_qml
-    \inqmlmodule QtMultimedia 5
+    \inqmlmodule QtMultimedia 5.0
 
     \c VideoOutput is part of the \b{QtMultimedia 5.0} module.