diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-08-17 10:05:38 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-17 10:20:37 +0000 |
| commit | e2cd975e13a5a2de9e1bbdd693df28710e8b32c1 (patch) | |
| tree | 9e1133128aacec2747125a71251f4e1664de3507 /examples | |
| parent | f3b8a3d2f29138c4648a7f202f2ba5b159eb0284 (diff) | |
Fix declarative-camera example
Adjust the example to MediaDevices API changes
Change-Id: Ie67016c9ff57cda5a1000099f553b76174c39513
Reviewed-by: Bartlomiej Moskal <bartlomiej.moskal@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 6546e6da5d53a798ba15a1b53843aaa5062713fb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples')
3 files changed, 6 insertions, 2 deletions
diff --git a/examples/multimedia/declarative-camera/CameraListButton.qml b/examples/multimedia/declarative-camera/CameraListButton.qml index 8b0c280ed..3a47479eb 100644 --- a/examples/multimedia/declarative-camera/CameraListButton.qml +++ b/examples/multimedia/declarative-camera/CameraListButton.qml @@ -49,6 +49,7 @@ ****************************************************************************/ import QtQuick +import QtMultimedia Item { id: cameraListButton @@ -78,6 +79,11 @@ Item { anchors.rightMargin: 16 anchors.top: parent.top visible: opacity > 0 + model: mediaDevices.videoInputs + + MediaDevices { + id: mediaDevices + } onSelected: popup.toggle() } diff --git a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml index 72a502684..7777df585 100644 --- a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml +++ b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml @@ -136,7 +136,6 @@ FocusScope { spacing: 8 CameraListButton { - model: MediaDevices.videoInputs onValueChanged: captureSession.camera.cameraDevice = value } diff --git a/examples/multimedia/declarative-camera/VideoCaptureControls.qml b/examples/multimedia/declarative-camera/VideoCaptureControls.qml index fa1819f6e..7b8d19531 100644 --- a/examples/multimedia/declarative-camera/VideoCaptureControls.qml +++ b/examples/multimedia/declarative-camera/VideoCaptureControls.qml @@ -111,7 +111,6 @@ FocusScope { spacing: 8 CameraListButton { - model: MediaDevices.videoInputs onValueChanged: captureSession.camera.cameraDevice = value } |