Merge the QCameraFocus API into QCamera

After API review, we decided that one large API in QCamera is
easier than having separate sub-objects that are only trying to
structure the API.

Change-Id: I5f820a580db1ddb3f47e11b88ca86215997f96ce
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 5 insertions, 1 deletions

diff --git a/src/multimedia/camera/qcamera_p.h b/src/multimedia/camera/qcamera_p.h
index c71cc7f73..67f06eeb3 100644
--- a/src/multimedia/camera/qcamera_p.h
+++ b/src/multimedia/camera/qcamera_p.h
@@ -58,6 +58,7 @@
 QT_BEGIN_NAMESPACE
 
 class QPlatformCamera;
+class QPlatformCameraFocus;
 class QPlatformMediaCaptureSession;
 
 class QCameraPrivate : public QObjectPrivate
@@ -77,7 +78,6 @@ public:
     QPlatformCamera *control = nullptr;
 
     QCameraExposure *cameraExposure = nullptr;
-    QCameraFocus *cameraFocus = nullptr;
     QCameraImageProcessing *imageProcessing = nullptr;
 
     QObject *capture = nullptr;
@@ -88,6 +88,10 @@ public:
     QCameraInfo cameraInfo;
     QCameraFormat cameraFormat;
 
+    QPlatformCameraFocus *focusControl = nullptr;
+    float zoomFactor = 1.;
+    QPointF customFocusPoint{-1, -1};
+
     void _q_error(int error, const QString &errorString);
     void unsetError() { error = QCamera::NoError; errorString.clear(); }
 };