Decouple qmediametadata.h from qmultimedia.h

qmultimedia.h is included in more places, but qmediametadata.h is
larger. This patch should reduce unnecessary #include-ing.

Change-Id: I4a3d174bafc555d794bb75087c1f6b79745ae903
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

examples/multimediawidgets/camera/camera.cpp

@@ -46,6 +46,7 @@
 #include <QMediaService>
 #include <QMediaRecorder>
 #include <QCameraViewfinder>
+#include <QMediaMetaData>
 
 #include <QMessageBox>
 #include <QPalette>

examples/multimediawidgets/player/player.cpp

@@ -47,9 +47,9 @@
 #include <QMediaService>
 #include <QMediaPlaylist>
 #include <QVideoProbe>
+#include <QMediaMetaData>
 #include <QtWidgets>
 
-
 Player::Player(QWidget *parent)
     : QWidget(parent)
     , videoWidget(0)

src/imports/multimedia/qdeclarativemediametadata_p.h

@@ -54,6 +54,7 @@
 //
 
 #include <QtQml/qqml.h>
+#include <QtMultimedia/qmediametadata.h>
 #include "qmediaobject.h"
 
 QT_BEGIN_NAMESPACE

src/multimedia/playback/playlistfileparser.cpp

@@ -43,7 +43,7 @@
 #include <qfileinfo.h>
 #include <QtNetwork/QNetworkReply>
 #include "qmediaobject_p.h"
-#include "qmultimedia.h"
+#include "qmediametadata.h"
 
 QT_BEGIN_NAMESPACE
 

src/multimedia/qmultimedia.h

@@ -47,7 +47,6 @@
 #include <QtCore/qstring.h>
 
 #include <QtMultimedia/qtmultimediadefs.h>
-#include <QtMultimedia/qmediametadata.h>
 
 QT_BEGIN_NAMESPACE
 

src/plugins/android/mediaplayer/qandroidmetadatareadercontrol.cpp

@@ -42,6 +42,7 @@
 #include "qandroidmetadatareadercontrol.h"
 
 #include "jmediametadataretriever.h"
+#include <QtMultimedia/qmediametadata.h>
 #include <qsize.h>
 #include <QDate>
 

src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm

@@ -42,7 +42,7 @@
 #include "avfmediaplayermetadatacontrol.h"
 #include "avfmediaplayersession.h"
 
-#include <QtMultimedia/qmultimedia.h>
+#include <QtMultimedia/qmediametadata.h>
 
 #import <AVFoundation/AVFoundation.h>
 

src/plugins/blackberry/mediaplayer/bbmetadatareadercontrol.cpp

@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "bbmetadatareadercontrol.h"
+#include <QtMultimedia/qmediametadata.h>
 
 QT_BEGIN_NAMESPACE
 

src/plugins/directshow/player/directshowmetadatacontrol.cpp

@@ -44,9 +44,9 @@
 #include <qnetwork.h>
 
 #include "directshowmetadatacontrol.h"
-
 #include "directshowplayerservice.h"
 
+#include <QtMultimedia/qmediametadata.h>
 #include <QtCore/qcoreapplication.h>
 
 #ifndef QT_NO_WMSDK

src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp

@@ -46,6 +46,7 @@
 #include <private/qgstvideobuffer_p.h>
 #include <private/qvideosurfacegstsink_p.h>
 #include <private/qgstutils_p.h>
+#include <QtMultimedia/qmediametadata.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qbuffer.h>
 #include <QtGui/qimagereader.h>

src/plugins/gstreamer/camerabin/camerabinmetadata.cpp

@@ -41,6 +41,8 @@
 
 #include "camerabinmetadata.h"
 
+#include <QtMultimedia/qmediametadata.h>
+
 #include <gst/gst.h>
 #include <gst/gstversion.h>
 

src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp

@@ -41,6 +41,8 @@
 
 #include "qgstreamercapturemetadatacontrol.h"
 
+#include <QtMultimedia/qmediametadata.h>
+
 #include <gst/gst.h>
 #include <gst/gstversion.h>
 

src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp

@@ -42,6 +42,7 @@
 #include "qgstreamermetadataprovider.h"
 #include "qgstreamerplayersession.h"
 #include <QDebug>
+#include <QtMultimedia/qmediametadata.h>
 
 #include <gst/gstversion.h>
 

src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp

@@ -52,6 +52,7 @@
 #include <gst/gstvalue.h>
 #include <gst/base/gstbasesrc.h>
 
+#include <QtMultimedia/qmediametadata.h>
 #include <QtCore/qdatetime.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qsize.h>

src/plugins/qt7/mediaplayer/qt7playermetadata.mm

@@ -43,6 +43,7 @@
 #include "qt7playermetadata.h"
 #include "qt7playersession.h"
 #include <QtCore/qvarlengtharray.h>
+#include <QtMultimedia/qmediametadata.h>
 
 #import <QTKit/QTMovie.h>
 

src/plugins/wmf/player/mfmetadatacontrol.cpp

@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 
+#include <qmediametadata.h>
 #include <qdatetime.h>
 #include <qimage.h>
 

tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp

@@ -46,6 +46,7 @@
 #include "qdeclarativeaudio_p.h"
 #include "qdeclarativemediametadata_p.h"
 
+#include <QtMultimedia/qmediametadata.h>
 #include <qmediaplayercontrol.h>
 #include <qmediaservice.h>
 #include <private/qmediaserviceprovider_p.h>

tests/auto/unit/qmediaobject/tst_qmediaobject.cpp

@@ -45,6 +45,7 @@
 
 #include <QtCore/qtimer.h>
 
+#include <QtMultimedia/qmediametadata.h>
 #include <qmediaobject.h>
 #include <qmediaservice.h>
 #include <qmetadatareadercontrol.h>

tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp

@@ -43,6 +43,7 @@
 
 #include <QtTest/QtTest>
 #include <QDebug>
+#include <QtMultimedia/qmediametadata.h>
 #include <qmediaobject.h>
 #include <qmediacontrol.h>
 #include <qmediaservice.h>

tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp

@@ -41,6 +41,7 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 #include <QtCore/QCoreApplication>
+#include <QtMultimedia/qmediametadata.h>
 
 #include "mockmetadatareadercontrol.h"
 

tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp

@@ -41,6 +41,7 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 #include <QtCore/QCoreApplication>
+#include <QtMultimedia/qmediametadata.h>
 #include "qmetadatawritercontrol.h"
 
 #include "mockmetadatawritercontrol.h"

tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h

@@ -44,6 +44,7 @@
 
 #include <QDateTime>
 #include <QTimer>
+#include <QtMultimedia/qmediametadata.h>
 
 #include "qcameraimagecapturecontrol.h"
 #include "qcameracontrol.h"