diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-05-17 14:35:58 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-05-18 08:44:31 +0000 |
| commit | 7b2e6ea598a15a81ad1ed15c5392472db4c23b7f (patch) | |
| tree | b597451a2ea01e07b6e455db68a2320608972f33 /src/multimedia/platform/qnx/camera/bbcameraexposurecontrol_p.h | |
| parent | d78a921256b50399cead644d69d2a06d43ef3e5c (diff) | |
Merge QCameraExposure into QCamera
As per API review, let's only have one class for QCamera.
Change-Id: I663e238e93ffd83708821e46f8f154c1fdc07731
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/multimedia/platform/qnx/camera/bbcameraexposurecontrol_p.h')
| -rw-r--r-- | src/multimedia/platform/qnx/camera/bbcameraexposurecontrol_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol_p.h b/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol_p.h index fec8bf526..60ffcd0f0 100644 --- a/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol_p.h +++ b/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol_p.h @@ -69,9 +69,9 @@ public: QVariant actualValue(ExposureParameter parameter) const override; bool setValue(ExposureParameter parameter, const QVariant& value) override; - QCameraExposure::FlashMode flashMode() const override; - void setFlashMode(QCameraExposure::FlashMode mode) override; - bool isFlashModeSupported(QCameraExposure::FlashMode mode) const override; + QCamera::FlashMode flashMode() const override; + void setFlashMode(QCamera::FlashMode mode) override; + bool isFlashModeSupported(QCamera::FlashMode mode) const override; bool isFlashReady() const override; private Q_SLOTS: @@ -79,9 +79,9 @@ private Q_SLOTS: private: BbCameraSession *m_session; - QCameraExposure::ExposureMode m_requestedExposureMode; + QCamera::ExposureMode m_requestedExposureMode; - QCameraExposure::FlashMode m_flashMode = QCameraExposure::FlashAuto; + QCamera::FlashMode m_flashMode = QCamera::FlashAuto; }; QT_END_NAMESPACE |