summaryrefslogtreecommitdiffstats
path: root/src/multimedia/camera/qcamera_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/camera/qcamera_p.h')
-rw-r--r--src/multimedia/camera/qcamera_p.h24
1 files changed, 10 insertions, 14 deletions
diff --git a/src/multimedia/camera/qcamera_p.h b/src/multimedia/camera/qcamera_p.h
index 946fc3ccc..fc80540b4 100644
--- a/src/multimedia/camera/qcamera_p.h
+++ b/src/multimedia/camera/qcamera_p.h
@@ -58,19 +58,14 @@
QT_BEGIN_NAMESPACE
class QCameraControl;
+class QMediaPlatformCaptureInterface;
-class QCameraPrivate : public QMediaSourcePrivate
+class QCameraPrivate : public QObjectPrivate
{
Q_DECLARE_NON_CONST_PUBLIC(QCamera)
public:
QCameraPrivate()
- : QMediaSourcePrivate(),
- control(nullptr),
- cameraExposure(nullptr),
- cameraFocus(nullptr),
- imageProcessing(nullptr),
- viewfinder(nullptr),
- capture(nullptr),
+ : QObjectPrivate(),
state(QCamera::UnloadedState),
error(QCamera::NoError),
supressLockChangedSignal(false),
@@ -83,14 +78,15 @@ public:
void clear();
- QCameraControl *control;
+ QMediaPlatformCaptureInterface *captureInterface = nullptr;
+ QCameraControl *control = nullptr;
- QCameraExposure *cameraExposure;
- QCameraFocus *cameraFocus;
- QCameraImageProcessing *imageProcessing;
+ QCameraExposure *cameraExposure = nullptr;
+ QCameraFocus *cameraFocus = nullptr;
+ QCameraImageProcessing *imageProcessing = nullptr;
- QMediaSink *viewfinder;
- QObject *capture;
+ QMediaSink *viewfinder = nullptr;
+ QObject *capture = nullptr;
QCamera::State state;