Add notify signals for QCameraFocus' min/max zoomFactor change

Change-Id: I2c278e761af3d6f1469705a1eb85a89f339590f0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

3 files changed, 10 insertions, 2 deletions

diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp
index ab8513569..9ca6d50c8 100644
--- a/src/multimedia/camera/qcamerafocus.cpp
+++ b/src/multimedia/camera/qcamerafocus.cpp
@@ -117,6 +117,10 @@ void QCameraFocusPrivate::init(QPlatformCamera *cameraControl)
 
     q->connect(focusControl, SIGNAL(zoomFactorChanged(qreal)),
                q, SIGNAL(zoomFactorChanged(qreal)));
+    q->connect(focusControl, SIGNAL(minimumZoomFactorChanged(float)),
+               q, SIGNAL(minimumZoomFactorChanged(float)));
+    q->connect(focusControl, SIGNAL(maximumZoomFactorChanged(float)),
+               q, SIGNAL(maximumZoomFactorChanged(float)));
 }
 
 /*!
diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h
index 262558b1d..df521afd4 100644
--- a/src/multimedia/camera/qcamerafocus.h
+++ b/src/multimedia/camera/qcamerafocus.h
@@ -66,8 +66,8 @@ class Q_MULTIMEDIA_EXPORT QCameraFocus : public QObject
     Q_PROPERTY(QPointF customFocusPoint READ customFocusPoint WRITE setCustomFocusPoint NOTIFY customFocusPointChanged)
     Q_PROPERTY(float focusDistance READ focusDistance WRITE setFocusDistance NOTIFY focusDistanceChanged)
 
-    Q_PROPERTY(float minimumZoomFactor READ minimumZoomFactor CONSTANT) // ### Should notify on camerainfo change
-    Q_PROPERTY(float maximumZoomFactor READ maximumZoomFactor CONSTANT) // ### ditto
+    Q_PROPERTY(float minimumZoomFactor READ minimumZoomFactor NOTIFY minimumZoomFactorChanged)
+    Q_PROPERTY(float maximumZoomFactor READ maximumZoomFactor NOTIFY maximumZoomFactorChanged)
     Q_PROPERTY(float zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged)
 
     Q_ENUMS(FocusMode)
@@ -115,6 +115,8 @@ public Q_SLOTS:
 Q_SIGNALS:
     void focusModeChanged();
     void zoomFactorChanged(float);
+    void minimumZoomFactorChanged(float);
+    void maximumZoomFactorChanged(float);
     void focusDistanceChanged(float);
     void customFocusPointChanged();
 
diff --git a/src/multimedia/platform/qplatformcamerafocus_p.h b/src/multimedia/platform/qplatformcamerafocus_p.h
index 92dbc6b2e..7813e087e 100644
--- a/src/multimedia/platform/qplatformcamerafocus_p.h
+++ b/src/multimedia/platform/qplatformcamerafocus_p.h
@@ -89,6 +89,8 @@ public:
 Q_SIGNALS:
     void focusModeChanged(QCameraFocus::FocusMode mode);
     void customFocusPointChanged(const QPointF &point);
+    void minimumZoomFactorChanged(float);
+    void maximumZoomFactorChanged(float);
 
 protected:
     explicit QPlatformCameraFocus(QObject *parent = nullptr);