diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-09-20 10:47:21 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-21 11:51:21 +0000 |
| commit | 36daede2669b1e07b05dea4c3941252490ab67e0 (patch) | |
| tree | 675aebd9b8a72b3135cd1aab91c5c4611e6ce9fa | |
| parent | e84b51b28e856caead1f514234bf84560f0cdc1c (diff) | |
| download | qtmultimedia-36daede2669b1e07b05dea4c3941252490ab67e0.tar.gz | |
Fix QML sample code to use a MediaCaptureSession
Correct the sample code and use a MediaCaptureSession.
Fixes: QTBUG-96652
Change-Id: I7e8872e0db98a6f34b499357a38e4f8712441975
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit f78c3885cc17c89d27b9e657fa4422ea9134d8c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/multimediaquick/camerafocus.qdoc | 11 | ||||
| -rw-r--r-- | src/multimediaquick/qquickimagecapture.cpp | 13 |
2 files changed, 14 insertions, 10 deletions
diff --git a/src/multimediaquick/camerafocus.qdoc b/src/multimediaquick/camerafocus.qdoc index 0101e2bfb..5fce6b645 100644 --- a/src/multimediaquick/camerafocus.qdoc +++ b/src/multimediaquick/camerafocus.qdoc @@ -60,17 +60,18 @@ QT_BEGIN_NAMESPACE width: 640 height: 360 - Camera { - id: camera + CaptureSession { + camera: Camera { + id: camera - focus { - focusMode: Camera.FocusMacro + focusMode: Camera.FocusModeAutoNear customFocusPoint: Qt.point(0.2, 0.2) // Focus relative to top-left corner } + videoOutput: videoOutput } VideoOutput { - source: camera + id: videoOutput anchors.fill: parent } } diff --git a/src/multimediaquick/qquickimagecapture.cpp b/src/multimediaquick/qquickimagecapture.cpp index 524fbdbe2..b2780a32e 100644 --- a/src/multimediaquick/qquickimagecapture.cpp +++ b/src/multimediaquick/qquickimagecapture.cpp @@ -64,11 +64,14 @@ QT_BEGIN_NAMESPACE imageCapture : ImageCapture { id: imageCapture } - camera: Camera { - id: camera - } + camera: Camera { + id: camera + } - videoOutput: VideoOutput { + videoOutput: videoOutput + } + VideoOutput { + id: videoOutput anchors.fill: parent MouseArea { @@ -79,7 +82,7 @@ QT_BEGIN_NAMESPACE Image { id: photoPreview - src: imageCapture.preview // always shows the last captured image + source: imageCapture.preview // always shows the last captured image } } \endqml |