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/integration/multimedia.pro

@@ -12,3 +12,4 @@ SUBDIRS += \
     qsoundeffect \
     qsound
 
+!qtHaveModule(widgets): SUBDIRS -= qcamerabackend

tests/auto/integration/qcamerabackend/qcamerabackend.pro

 TARGET = tst_qcamerabackend
 
-QT += multimedia-private testlib
+# DirectShow plugin requires widgets.
+QT += multimedia-private widgets testlib
 
 # This is more of a system test
 CONFIG += testcase

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"