Rename namespace QtMultimedia::MetaData -> QMediaMetaData

Main code, examples, tests and docs updated. Method:
1. Remove unused forward-declarations, "class QMediaMetaData"
2. Mass find+replace "QtMultimedia::MetaData" -> "QMediaMetaData"
3. Un-nest from the QtMultimedia namespace in qtmedianamespace.h

For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed. Also, Qt guidelines don't include nested namespaces
(http://lists.qt-project.org/pipermail/development/2012-October/006756.html)

Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)

Change-Id: I40e59c1cf58c1792725e735e9285c51bc5f226b1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

4 files changed, 208 insertions, 208 deletions

diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml
index ad55aee4f..58d16561d 100644
--- a/src/imports/multimedia/Video.qml
+++ b/src/imports/multimedia/Video.qml
@@ -397,7 +397,7 @@ Item {
 
     This property holds the title of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -405,7 +405,7 @@ Item {
 
     This property holds the sub-title of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -413,7 +413,7 @@ Item {
 
     This property holds the author of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -421,7 +421,7 @@ Item {
 
     This property holds a user comment about the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -429,7 +429,7 @@ Item {
 
     This property holds a description of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -437,7 +437,7 @@ Item {
 
     This property holds the category of the media
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -445,7 +445,7 @@ Item {
 
     This property holds the genre of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -453,7 +453,7 @@ Item {
 
     This property holds the year of release of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -461,7 +461,7 @@ Item {
 
     This property holds the date of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -469,7 +469,7 @@ Item {
 
     This property holds a user rating of the media in the range of 0 to 100.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -477,7 +477,7 @@ Item {
 
     This property holds a list of keywords describing the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -485,7 +485,7 @@ Item {
 
     This property holds the language of the media, as an ISO 639-2 code.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -493,7 +493,7 @@ Item {
 
     This property holds the publisher of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -501,7 +501,7 @@ Item {
 
     This property holds the media's copyright notice.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -509,7 +509,7 @@ Item {
 
     This property holds the parental rating of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -518,7 +518,7 @@ Item {
     This property holds the name of the rating organization responsible for the
     parental rating of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -526,7 +526,7 @@ Item {
 
     This property property holds the size of the media in bytes.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -534,7 +534,7 @@ Item {
 
     This property holds the type of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -543,7 +543,7 @@ Item {
     This property holds the bit rate of the media's audio stream in bits per
     second.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -551,7 +551,7 @@ Item {
 
     This property holds the encoding of the media audio stream.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -559,7 +559,7 @@ Item {
 
     This property holds the average volume level of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -567,7 +567,7 @@ Item {
 
     This property holds the number of channels in the media's audio stream.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -575,7 +575,7 @@ Item {
 
     This property holds the peak volume of the media's audio stream.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -583,7 +583,7 @@ Item {
 
     This property holds the sample rate of the media's audio stream in Hertz.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -591,7 +591,7 @@ Item {
 
     This property holds the title of the album the media belongs to.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -600,7 +600,7 @@ Item {
     This property holds the name of the principal artist of the album the media
     belongs to.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -608,7 +608,7 @@ Item {
 
     This property holds the names of artists contributing to the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -616,7 +616,7 @@ Item {
 
     This property holds the composer of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -624,7 +624,7 @@ Item {
 
     This property holds the conductor of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -632,7 +632,7 @@ Item {
 
     This property holds the lyrics to the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -640,7 +640,7 @@ Item {
 
     This property holds the mood of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -648,7 +648,7 @@ Item {
 
     This property holds the track number of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -656,7 +656,7 @@ Item {
 
     This property holds the number of track on the album containing the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -664,7 +664,7 @@ Item {
 
     This property holds the URL of a small cover art image.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -672,7 +672,7 @@ Item {
 
     This property holds the URL of a large cover art image.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -680,7 +680,7 @@ Item {
 
     This property holds the dimension of an image or video.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -688,7 +688,7 @@ Item {
 
     This property holds the pixel aspect ratio of an image or video.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -696,7 +696,7 @@ Item {
 
     This property holds the frame rate of the media's video stream.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -705,7 +705,7 @@ Item {
     This property holds the bit rate of the media's video stream in bits per
     second.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -713,7 +713,7 @@ Item {
 
     This property holds the encoding of the media's video stream.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -721,7 +721,7 @@ Item {
 
     This property holds the URL of a poster image.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -729,7 +729,7 @@ Item {
 
     This property holds the chapter number of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -737,7 +737,7 @@ Item {
 
     This property holds the director of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -745,7 +745,7 @@ Item {
 
     This property holds the lead performer in the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -753,7 +753,7 @@ Item {
 
     This property holds the writer of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 // The remaining properties are related to photos, and are technically
@@ -762,156 +762,156 @@ Item {
 /*!
     \qmlproperty variant Video::metaData.cameraManufacturer
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.cameraModel
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.event
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.subject
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.orientation
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureTime
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.fNumber
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureProgram
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.isoSpeedRatings
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureBiasValue
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.dateTimeDigitized
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.subjectDistance
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.meteringMode
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.lightSource
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.flash
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.focalLength
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureMode
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.whiteBalance
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.DigitalZoomRatio
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.focalLengthIn35mmFilm
 
-    \sa {QtMultimedia::MetaData::FocalLengthIn35mmFile}
+    \sa {QMediaMetaData::FocalLengthIn35mmFile}
 */
 
 /*!
     \qmlproperty variant Video::metaData.sceneCaptureType
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.gainControl
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.contrast
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.saturation
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.sharpness
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
     \qmlproperty variant Video::metaData.deviceSettingDescription
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 5c1bff81b..85d65d3f6 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -757,7 +757,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the title of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -765,7 +765,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the sub-title of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -773,7 +773,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the author of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -781,7 +781,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a user comment about the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -789,7 +789,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a description of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -797,7 +797,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the category of the media
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -805,7 +805,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the genre of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -813,7 +813,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the year of release of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -821,7 +821,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the date of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -829,7 +829,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a user rating of the media in the range of 0 to 100.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -837,7 +837,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a list of keywords describing the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -845,7 +845,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the language of the media, as an ISO 639-2 code.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -853,7 +853,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the publisher of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -861,7 +861,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the media's copyright notice.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -869,7 +869,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the parental rating of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -878,7 +878,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}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -886,7 +886,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property property holds the size of the media in bytes.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -894,7 +894,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the type of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -903,7 +903,7 @@ void QDeclarativeAudio::_q_statusChanged()
     This property holds the bit rate of the media's audio stream in bits per
     second.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -911,7 +911,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the encoding of the media audio stream.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -919,7 +919,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the average volume level of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -927,7 +927,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the number of channels in the media's audio stream.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -935,7 +935,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the peak volume of media's audio stream.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -943,7 +943,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the sample rate of the media's audio stream in hertz.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -951,7 +951,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the title of the album the media belongs to.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -960,7 +960,7 @@ void QDeclarativeAudio::_q_statusChanged()
     This property holds the name of the principal artist of the album the media
     belongs to.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -968,7 +968,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the names of artists contributing to the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -976,7 +976,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the composer of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -984,7 +984,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the conductor of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -992,7 +992,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the lyrics to the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1000,7 +1000,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the mood of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1008,7 +1008,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the track number of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1016,7 +1016,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the number of tracks on the album containing the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1024,7 +1024,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the URL of a small cover art image.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1032,7 +1032,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the URL of a large cover art image.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1040,7 +1040,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the dimension of an image or video.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1048,7 +1048,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the pixel aspect ratio of an image or video.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1056,7 +1056,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the frame rate of the media's video stream.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1065,7 +1065,7 @@ void QDeclarativeAudio::_q_statusChanged()
     This property holds the bit rate of the media's video stream in bits per
     second.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1073,7 +1073,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the encoding of the media's video stream.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1081,7 +1081,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the URL of a poster image.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1089,7 +1089,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the chapter number of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1097,7 +1097,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the director of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1105,7 +1105,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the lead performer in the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1113,7 +1113,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the writer of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 ///////////// MediaPlayer Docs /////////////
@@ -1425,7 +1425,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the title of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1433,7 +1433,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the sub-title of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1441,7 +1441,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the author of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1449,7 +1449,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a user comment about the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1457,7 +1457,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a description of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1465,7 +1465,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the category of the media
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1473,7 +1473,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the genre of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1481,7 +1481,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the year of release of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1489,7 +1489,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the date of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1497,7 +1497,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a user rating of the media in the range of 0 to 100.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1505,7 +1505,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds a list of keywords describing the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1513,7 +1513,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the language of the media, as an ISO 639-2 code.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1521,7 +1521,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the publisher of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1529,7 +1529,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the media's copyright notice.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1537,7 +1537,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the parental rating of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1546,7 +1546,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}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1554,7 +1554,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property property holds the size of the media in bytes.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1562,7 +1562,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the type of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1571,7 +1571,7 @@ void QDeclarativeAudio::_q_statusChanged()
     This property holds the bit rate of the media's audio stream in bits per
     second.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1579,7 +1579,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the encoding of the media audio stream.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1587,7 +1587,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the average volume level of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1595,7 +1595,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the number of channels in the media's audio stream.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1603,7 +1603,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the peak volume of media's audio stream.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1611,7 +1611,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the sample rate of the media's audio stream in hertz.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1619,7 +1619,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the title of the album the media belongs to.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1628,7 +1628,7 @@ void QDeclarativeAudio::_q_statusChanged()
     This property holds the name of the principal artist of the album the media
     belongs to.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1636,7 +1636,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the names of artists contributing to the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1644,7 +1644,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the composer of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1652,7 +1652,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the conductor of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1660,7 +1660,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the lyrics to the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1668,7 +1668,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the mood of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1676,7 +1676,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the track number of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1684,7 +1684,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the number of tracks on the album containing the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1692,7 +1692,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the URL of a small cover art image.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1700,7 +1700,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the URL of a large cover art image.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1708,7 +1708,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the dimension of an image or video.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1716,7 +1716,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the pixel aspect ratio of an image or video.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1724,7 +1724,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the frame rate of the media's video stream.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1733,7 +1733,7 @@ void QDeclarativeAudio::_q_statusChanged()
     This property holds the bit rate of the media's video stream in bits per
     second.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1741,7 +1741,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the encoding of the media's video stream.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1749,7 +1749,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the URL of a poster image.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1757,7 +1757,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the chapter number of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1765,7 +1765,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the director of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1773,7 +1773,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the lead performer in the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 /*!
@@ -1781,7 +1781,7 @@ void QDeclarativeAudio::_q_statusChanged()
 
     This property holds the writer of the media.
 
-    \sa {QtMultimedia::MetaData}
+    \sa {QMediaMetaData}
 */
 
 QT_END_NAMESPACE
diff --git a/src/imports/multimedia/qdeclarativecameracapture.cpp b/src/imports/multimedia/qdeclarativecameracapture.cpp
index 0e7a3bad8..3ef8665b2 100644
--- a/src/imports/multimedia/qdeclarativecameracapture.cpp
+++ b/src/imports/multimedia/qdeclarativecameracapture.cpp
@@ -300,7 +300,7 @@ QString QDeclarativeCameraCapture::errorString() const
 
     Sets a particular metadata \a key to \a value for the subsequent image captures.
 
-    \sa QtMultimedia::MetaData
+    \sa QMediaMetaData
 */
 void QDeclarativeCameraCapture::setMetadata(const QString &key, const QVariant &value)
 {
diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h
index f05e21807..b9c45ac17 100644
--- a/src/imports/multimedia/qdeclarativemediametadata_p.h
+++ b/src/imports/multimedia/qdeclarativemediametadata_p.h
@@ -116,57 +116,57 @@ public:
     {
     }
 
-    QVariant title() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Title); }
-    QVariant subTitle() const { return m_mediaObject->metaData(QtMultimedia::MetaData::SubTitle); }
-    QVariant author() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Author); }
-    QVariant comment() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Comment); }
-    QVariant description() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Description); }
-    QVariant category() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Category); }
-    QVariant genre() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Genre); }
-    QVariant year() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Year); }
-    QVariant date() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Date); }
-    QVariant userRating() const { return m_mediaObject->metaData(QtMultimedia::MetaData::UserRating); }
-    QVariant keywords() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Keywords); }
-    QVariant language() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Language); }
-    QVariant publisher() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Publisher); }
-    QVariant copyright() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Copyright); }
-    QVariant parentalRating() const { return m_mediaObject->metaData(QtMultimedia::MetaData::ParentalRating); }
+    QVariant title() const { return m_mediaObject->metaData(QMediaMetaData::Title); }
+    QVariant subTitle() const { return m_mediaObject->metaData(QMediaMetaData::SubTitle); }
+    QVariant author() const { return m_mediaObject->metaData(QMediaMetaData::Author); }
+    QVariant comment() const { return m_mediaObject->metaData(QMediaMetaData::Comment); }
+    QVariant description() const { return m_mediaObject->metaData(QMediaMetaData::Description); }
+    QVariant category() const { return m_mediaObject->metaData(QMediaMetaData::Category); }
+    QVariant genre() const { return m_mediaObject->metaData(QMediaMetaData::Genre); }
+    QVariant year() const { return m_mediaObject->metaData(QMediaMetaData::Year); }
+    QVariant date() const { return m_mediaObject->metaData(QMediaMetaData::Date); }
+    QVariant userRating() const { return m_mediaObject->metaData(QMediaMetaData::UserRating); }
+    QVariant keywords() const { return m_mediaObject->metaData(QMediaMetaData::Keywords); }
+    QVariant language() const { return m_mediaObject->metaData(QMediaMetaData::Language); }
+    QVariant publisher() const { return m_mediaObject->metaData(QMediaMetaData::Publisher); }
+    QVariant copyright() const { return m_mediaObject->metaData(QMediaMetaData::Copyright); }
+    QVariant parentalRating() const { return m_mediaObject->metaData(QMediaMetaData::ParentalRating); }
     QVariant ratingOrganization() const {
-        return m_mediaObject->metaData(QtMultimedia::MetaData::RatingOrganization); }
-    QVariant size() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Size); }
-    QVariant mediaType() const { return m_mediaObject->metaData(QtMultimedia::MetaData::MediaType); }
-    QVariant duration() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Duration); }
-    QVariant audioBitRate() const { return m_mediaObject->metaData(QtMultimedia::MetaData::AudioBitRate); }
-    QVariant audioCodec() const { return m_mediaObject->metaData(QtMultimedia::MetaData::AudioCodec); }
-    QVariant averageLevel() const { return m_mediaObject->metaData(QtMultimedia::MetaData::AverageLevel); }
-    QVariant channelCount() const { return m_mediaObject->metaData(QtMultimedia::MetaData::ChannelCount); }
-    QVariant peakValue() const { return m_mediaObject->metaData(QtMultimedia::MetaData::PeakValue); }
-    QVariant sampleRate() const { return m_mediaObject->metaData(QtMultimedia::MetaData::SampleRate); }
-    QVariant albumTitle() const { return m_mediaObject->metaData(QtMultimedia::MetaData::AlbumTitle); }
-    QVariant albumArtist() const { return m_mediaObject->metaData(QtMultimedia::MetaData::AlbumArtist); }
+        return m_mediaObject->metaData(QMediaMetaData::RatingOrganization); }
+    QVariant size() const { return m_mediaObject->metaData(QMediaMetaData::Size); }
+    QVariant mediaType() const { return m_mediaObject->metaData(QMediaMetaData::MediaType); }
+    QVariant duration() const { return m_mediaObject->metaData(QMediaMetaData::Duration); }
+    QVariant audioBitRate() const { return m_mediaObject->metaData(QMediaMetaData::AudioBitRate); }
+    QVariant audioCodec() const { return m_mediaObject->metaData(QMediaMetaData::AudioCodec); }
+    QVariant averageLevel() const { return m_mediaObject->metaData(QMediaMetaData::AverageLevel); }
+    QVariant channelCount() const { return m_mediaObject->metaData(QMediaMetaData::ChannelCount); }
+    QVariant peakValue() const { return m_mediaObject->metaData(QMediaMetaData::PeakValue); }
+    QVariant sampleRate() const { return m_mediaObject->metaData(QMediaMetaData::SampleRate); }
+    QVariant albumTitle() const { return m_mediaObject->metaData(QMediaMetaData::AlbumTitle); }
+    QVariant albumArtist() const { return m_mediaObject->metaData(QMediaMetaData::AlbumArtist); }
     QVariant contributingArtist() const {
-        return m_mediaObject->metaData(QtMultimedia::MetaData::ContributingArtist); }
-    QVariant composer() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Composer); }
-    QVariant conductor() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Conductor); }
-    QVariant lyrics() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Lyrics); }
-    QVariant mood() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Mood); }
-    QVariant trackNumber() const { return m_mediaObject->metaData(QtMultimedia::MetaData::TrackNumber); }
-    QVariant trackCount() const { return m_mediaObject->metaData(QtMultimedia::MetaData::TrackCount); }
+        return m_mediaObject->metaData(QMediaMetaData::ContributingArtist); }
+    QVariant composer() const { return m_mediaObject->metaData(QMediaMetaData::Composer); }
+    QVariant conductor() const { return m_mediaObject->metaData(QMediaMetaData::Conductor); }
+    QVariant lyrics() const { return m_mediaObject->metaData(QMediaMetaData::Lyrics); }
+    QVariant mood() const { return m_mediaObject->metaData(QMediaMetaData::Mood); }
+    QVariant trackNumber() const { return m_mediaObject->metaData(QMediaMetaData::TrackNumber); }
+    QVariant trackCount() const { return m_mediaObject->metaData(QMediaMetaData::TrackCount); }
     QVariant coverArtUrlSmall() const {
-        return m_mediaObject->metaData(QtMultimedia::MetaData::CoverArtUrlSmall); }
+        return m_mediaObject->metaData(QMediaMetaData::CoverArtUrlSmall); }
     QVariant coverArtUrlLarge() const {
-        return m_mediaObject->metaData(QtMultimedia::MetaData::CoverArtUrlLarge); }
-    QVariant resolution() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Resolution); }
+        return m_mediaObject->metaData(QMediaMetaData::CoverArtUrlLarge); }
+    QVariant resolution() const { return m_mediaObject->metaData(QMediaMetaData::Resolution); }
     QVariant pixelAspectRatio() const {
-        return m_mediaObject->metaData(QtMultimedia::MetaData::PixelAspectRatio); }
-    QVariant videoFrameRate() const { return m_mediaObject->metaData(QtMultimedia::MetaData::VideoFrameRate); }
-    QVariant videoBitRate() const { return m_mediaObject->metaData(QtMultimedia::MetaData::VideoBitRate); }
-    QVariant videoCodec() const { return m_mediaObject->metaData(QtMultimedia::MetaData::VideoCodec); }
-    QVariant posterUrl() const { return m_mediaObject->metaData(QtMultimedia::MetaData::PosterUrl); }
-    QVariant chapterNumber() const { return m_mediaObject->metaData(QtMultimedia::MetaData::ChapterNumber); }
-    QVariant director() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Director); }
-    QVariant leadPerformer() const { return m_mediaObject->metaData(QtMultimedia::MetaData::LeadPerformer); }
-    QVariant writer() const { return m_mediaObject->metaData(QtMultimedia::MetaData::Writer); }
+        return m_mediaObject->metaData(QMediaMetaData::PixelAspectRatio); }
+    QVariant videoFrameRate() const { return m_mediaObject->metaData(QMediaMetaData::VideoFrameRate); }
+    QVariant videoBitRate() const { return m_mediaObject->metaData(QMediaMetaData::VideoBitRate); }
+    QVariant videoCodec() const { return m_mediaObject->metaData(QMediaMetaData::VideoCodec); }
+    QVariant posterUrl() const { return m_mediaObject->metaData(QMediaMetaData::PosterUrl); }
+    QVariant chapterNumber() const { return m_mediaObject->metaData(QMediaMetaData::ChapterNumber); }
+    QVariant director() const { return m_mediaObject->metaData(QMediaMetaData::Director); }
+    QVariant leadPerformer() const { return m_mediaObject->metaData(QMediaMetaData::LeadPerformer); }
+    QVariant writer() const { return m_mediaObject->metaData(QMediaMetaData::Writer); }
 
 Q_SIGNALS:
     void metaDataChanged();