11 files changed, 27 insertions, 21 deletions
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index a1928bfb2..40f0b24fd 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -289,7 +289,11 @@ QCameraImageProcessing *QCamera::imageProcessing() const
 }
 
 /*!
-    Sets the QMediaSink based camera \a viewfinder.
+    Sets a QObject based camera \a viewfinder.
+
+    A QObject based viewfinder is expected to have an invokable videoSurface()
+    method that returns a QAbstractVideoSurface.
+
     The previously set viewfinder is detached.
 */
 void QCamera::setViewfinder(QObject *viewfinder)
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index 8946aabf3..44afdbd03 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -46,7 +46,7 @@
 #include <QtCore/qpoint.h>
 #include <QtCore/qrect.h>
 
-#include <QtMultimedia/qmediasource.h>
+#include <QtCore/qobject.h>
 
 #include <QtMultimedia/qcameraexposure.h>
 #include <QtMultimedia/qcamerafocus.h>
diff --git a/src/multimedia/camera/qcamera_p.h b/src/multimedia/camera/qcamera_p.h
index fc80540b4..ec61a002b 100644
--- a/src/multimedia/camera/qcamera_p.h
+++ b/src/multimedia/camera/qcamera_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include "qmediasource_p.h"
+#include "private/qobject_p.h"
 #include "qcamera.h"
 #include "qcamerainfo.h"
 
@@ -62,7 +62,7 @@ class QMediaPlatformCaptureInterface;
 
 class QCameraPrivate : public QObjectPrivate
 {
-    Q_DECLARE_NON_CONST_PUBLIC(QCamera)
+    Q_DECLARE_PUBLIC(QCamera)
 public:
     QCameraPrivate()
         : QObjectPrivate(),
@@ -85,7 +85,6 @@ public:
     QCameraFocus *cameraFocus = nullptr;
     QCameraImageProcessing *imageProcessing = nullptr;
 
-    QMediaSink *viewfinder = nullptr;
     QObject *capture = nullptr;
 
     QCamera::State state;
diff --git a/src/multimedia/camera/qcameraexposure.cpp b/src/multimedia/camera/qcameraexposure.cpp
index 0c8668c60..b18337792 100644
--- a/src/multimedia/camera/qcameraexposure.cpp
+++ b/src/multimedia/camera/qcameraexposure.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qcameraexposure.h"
-#include "qmediasource_p.h"
+#include "private/qobject_p.h"
 
 #include <qcamera.h>
 #include <qcameraexposurecontrol.h>
@@ -63,10 +63,9 @@ QT_BEGIN_NAMESPACE
 
 //#define DEBUG_EXPOSURE_CHANGES 1
 
-
 class QCameraExposurePrivate
 {
-    Q_DECLARE_NON_CONST_PUBLIC(QCameraExposure)
+    Q_DECLARE_PUBLIC(QCameraExposure)
 public:
     void init(QCameraControl *cameraControl);
     QCameraExposure *q_ptr;
diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h
index d6550c6e3..9c3e8cbff 100644
--- a/src/multimedia/camera/qcameraexposure.h
+++ b/src/multimedia/camera/qcameraexposure.h
@@ -40,7 +40,8 @@
 #ifndef QCAMERAEXPOSURE_H
 #define QCAMERAEXPOSURE_H
 
-#include <QtMultimedia/qmediasource.h>
+#include <QtCore/qobject.h>
+#include <QtMultimedia/qtmultimediaglobal.h>
 #include <QtMultimedia/qmediaenumdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp
index badc765c3..6fbec82e9 100644
--- a/src/multimedia/camera/qcamerafocus.cpp
+++ b/src/multimedia/camera/qcamerafocus.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qcamerafocus.h"
-#include "qmediasource_p.h"
+#include "private/qobject_p.h"
 
 #include <qcamera.h>
 #include <qcameracontrol.h>
@@ -247,8 +247,11 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status)
     \sa QCameraFocusZone
 */
 
+#define Q_DECLARE_NON_CONST_PUBLIC(Class) \
+    inline Class* q_func() { return static_cast<Class *>(q_ptr); } \
+    friend class Class;
 
-class QCameraFocusPrivate : public QMediaSourcePrivate
+class QCameraFocusPrivate : public QObjectPrivate
 {
     Q_DECLARE_NON_CONST_PUBLIC(QCameraFocus)
 public:
@@ -261,6 +264,7 @@ public:
     float zoomFactor = 1.;
 };
 
+#undef Q_DECLARE_NON_CONST_PUBLIC
 
 void QCameraFocusPrivate::init(QCameraControl *cameraControl)
 {
diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h
index ecdb7b623..92946e1ae 100644
--- a/src/multimedia/camera/qcamerafocus.h
+++ b/src/multimedia/camera/qcamerafocus.h
@@ -46,8 +46,9 @@
 #include <QtCore/qpoint.h>
 #include <QtCore/qrect.h>
 #include <QtCore/qshareddata.h>
+#include <QtCore/qobject.h>
 
-#include <QtMultimedia/qmediasource.h>
+#include <QtMultimedia/qtmultimediaglobal.h>
 #include <QtMultimedia/qmediaenumdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp
index 6f1d610f5..6b0d4cb9e 100644
--- a/src/multimedia/camera/qcameraimagecapture.cpp
+++ b/src/multimedia/camera/qcameraimagecapture.cpp
@@ -42,7 +42,7 @@
 #include <qmediametadata.h>
 #include <private/qmediaplatformcaptureinterface_p.h>
 
-#include "qmediasource_p.h"
+#include "private/qobject_p.h"
 #include <qmediaservice.h>
 #include <qcamera.h>
 #include <qcameracontrol.h>
@@ -82,7 +82,7 @@ QT_BEGIN_NAMESPACE
 
 class QCameraImageCapturePrivate
 {
-    Q_DECLARE_NON_CONST_PUBLIC(QCameraImageCapture)
+    Q_DECLARE_PUBLIC(QCameraImageCapture)
 public:
     QCamera *camera = nullptr;
 
diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h
index 4b7684ca4..1ca4111bc 100644
--- a/src/multimedia/camera/qcameraimagecapture.h
+++ b/src/multimedia/camera/qcameraimagecapture.h
@@ -40,9 +40,8 @@
 #ifndef QCAMERAIMAGECAPTURE_H
 #define QCAMERAIMAGECAPTURE_H
 
-#include <QtMultimedia/qmediasource.h>
+#include <QtCore/qobject.h>
 #include <QtMultimedia/qmediaencodersettings.h>
-#include <QtMultimedia/qmediasink.h>
 #include <QtMultimedia/qvideoframe.h>
 
 #include <QtMultimedia/qmediaenumdebug.h>
diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp
index 502bcf07a..49e77b023 100644
--- a/src/multimedia/camera/qcameraimageprocessing.cpp
+++ b/src/multimedia/camera/qcameraimageprocessing.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qcameraimageprocessing.h"
-#include "qmediasource_p.h"
+#include "private/qobject_p.h"
 
 #include <qcameracontrol.h>
 #include <qcameraimageprocessingcontrol.h>
@@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE
     \sa QCameraImageProcessingControl
 */
 
-class QCameraImageProcessingPrivate : public QMediaSourcePrivate
+class QCameraImageProcessingPrivate : public QObjectPrivate
 {
 public:
     void init(QCameraControl *cameraControl);
diff --git a/src/multimedia/camera/qcameraimageprocessing.h b/src/multimedia/camera/qcameraimageprocessing.h
index d77e9a694..b2e31536d 100644
--- a/src/multimedia/camera/qcameraimageprocessing.h
+++ b/src/multimedia/camera/qcameraimageprocessing.h
@@ -45,10 +45,9 @@
 #include <QtCore/qsize.h>
 #include <QtCore/qpoint.h>
 #include <QtCore/qrect.h>
+#include <QtCore/qobject.h>
 
-#include <QtMultimedia/qmediaservice.h>
-#include <QtMultimedia/qmediasource.h>
-#include <QtMultimedia/qmediaservice.h>
+#include <QtMultimedia/qtmultimediaglobal.h>
 #include <QtMultimedia/qmediaenumdebug.h>
 
 QT_BEGIN_NAMESPACE