summaryrefslogtreecommitdiffstats
path: root/examples/multimediawidgets/camera/camera.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-04-14 15:20:19 +0200
committerLars Knoll <lars.knoll@qt.io>2021-04-19 11:06:39 +0000
commit45861b09e330d76b1663fa2f809dd1de0740699e (patch)
tree6f6bd12b5bd58940cf7ec738ffacbef3a5bcc6d5 /examples/multimediawidgets/camera/camera.h
parentb43c44e3e5aa89f076ba2846c30ca2edc435c741 (diff)
Make QMediaDeviceManager available to QML
This required some changes to the QMediaDeviceManager API, namely that it can be instantiated itself. Add required API as properties to QMediaDeviceManager and expose QAudioDeviceInfo and QCameraInfo as well. Change-Id: I4f7ef04d703f84cc6caefd62ad453f166e3b1c9b Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'examples/multimediawidgets/camera/camera.h')
-rw-r--r--examples/multimediawidgets/camera/camera.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index c443fc195..3a17233b2 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
@@ -57,6 +57,7 @@
#include <QScopedPointer>
#include <QMediaMetaData>
#include <QMediaCaptureSession>
+#include <QMediaDeviceManager>
#include <QMainWindow>
@@ -129,6 +130,7 @@ private:
QActionGroup *videoDevicesGroup = nullptr;
+ QMediaDeviceManager m_manager;
QMediaCaptureSession m_captureSession;
QScopedPointer<QCamera> m_camera;
QCameraImageCapture *m_imageCapture;