From d78a921256b50399cead644d69d2a06d43ef3e5c Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 17 May 2021 14:13:54 +0200 Subject: 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 --- examples/multimedia/declarative-camera/PhotoCaptureControls.qml | 4 ++-- examples/multimedia/declarative-camera/VideoCaptureControls.qml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'examples') diff --git a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml index 2a456e8b3..e7eacdb0d 100644 --- a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml +++ b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml @@ -162,8 +162,8 @@ FocusScope { width : 100 height: parent.height - currentZoom: camera.focus.zoomFactor - maximumZoom: camera.focus.maximumZoomFactor + currentZoom: camera.zoomFactor + maximumZoom: camera.maximumZoomFactor onZoomTo: camera.setDigitalZoom(value) } } diff --git a/examples/multimedia/declarative-camera/VideoCaptureControls.qml b/examples/multimedia/declarative-camera/VideoCaptureControls.qml index 4084b38b6..ac3cbe3e0 100644 --- a/examples/multimedia/declarative-camera/VideoCaptureControls.qml +++ b/examples/multimedia/declarative-camera/VideoCaptureControls.qml @@ -135,8 +135,8 @@ FocusScope { width : 100 height: parent.height - currentZoom: captureSession.camera.focus.zoomFactor - maximumZoom: captureSession.camera.focus.maximumZoomFactor - onZoomTo: captureSession.camera.focus.zoomFactor = value + currentZoom: captureSession.camera.zoomFactor + maximumZoom: captureSession.camera.maximumZoomFactor + onZoomTo: captureSession.camera.zoomFactor = value } } -- cgit v1.2.3