summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/multimedia/platform/darwin/camera/avfcamerarenderercontrol_p.h1
-rw-r--r--src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h2
-rw-r--r--src/multimedia/platform/darwin/mediaplayer/avfmediaplayersession_p.h2
-rw-r--r--src/multimedia/platform/darwin/mediaplayer/avfvideorenderercontrol_p.h1
-rw-r--r--src/multimedia/platform/darwin/qdarwinintegration.cpp2
5 files changed, 5 insertions, 3 deletions
diff --git a/src/multimedia/platform/darwin/camera/avfcamerarenderercontrol_p.h b/src/multimedia/platform/darwin/camera/avfcamerarenderercontrol_p.h
index a7fc4fd25..2286938fa 100644
--- a/src/multimedia/platform/darwin/camera/avfcamerarenderercontrol_p.h
+++ b/src/multimedia/platform/darwin/camera/avfcamerarenderercontrol_p.h
@@ -64,6 +64,7 @@ QT_BEGIN_NAMESPACE
class AVFCameraSession;
class AVFCameraService;
class AVFCameraRendererControl;
+class QAbstractVideoSurface;
class AVFCameraRendererControl : public QObject
{
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
index a2d7d7690..4df2c6e9b 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
+++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
@@ -51,7 +51,7 @@
// We mean it.
//
-#include <QtMultimedia/QPlatformMediaPlayer>
+#include <qplatformmediaplayer_p.h>
#include <QtCore/QObject>
QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayersession_p.h b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayersession_p.h
index bdca6639c..d6bc77e19 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayersession_p.h
+++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayersession_p.h
@@ -57,7 +57,7 @@
#include <QtCore/QResource>
#include <QtCore/QUrl>
-#include <QtMultimedia/QPlatformMediaPlayer>
+#include <qplatformmediaplayer_p.h>
#include <QtMultimedia/QMediaPlayer>
Q_FORWARD_DECLARE_OBJC_CLASS(AVAsset);
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfvideorenderercontrol_p.h b/src/multimedia/platform/darwin/mediaplayer/avfvideorenderercontrol_p.h
index 21a3617d2..a188e4db1 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfvideorenderercontrol_p.h
+++ b/src/multimedia/platform/darwin/mediaplayer/avfvideorenderercontrol_p.h
@@ -63,6 +63,7 @@ QT_BEGIN_NAMESPACE
class AVFDisplayLink;
class AVFVideoFrameRenderer;
+class QAbstractVideoSurface;
class AVFVideoRendererControl : public QObject, public AVFVideoOutput
{
diff --git a/src/multimedia/platform/darwin/qdarwinintegration.cpp b/src/multimedia/platform/darwin/qdarwinintegration.cpp
index 1d55fad1b..8c81e6ba3 100644
--- a/src/multimedia/platform/darwin/qdarwinintegration.cpp
+++ b/src/multimedia/platform/darwin/qdarwinintegration.cpp
@@ -70,7 +70,7 @@ QPlatformMediaFormatInfo *QDarwinIntegration::formatInfo()
return m_formatInfo;
}
-QPlatformMediaCaptureInterface *QDarwinIntegration::createCaptureInterface(QMediaRecorder::CaptureMode)
+QPlatformMediaCapture *QDarwinIntegration::createCaptureInterface(QMediaRecorder::CaptureMode)
{
return new AVFCameraService;
}