From 7b2e6ea598a15a81ad1ed15c5392472db4c23b7f Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 17 May 2021 14:35:58 +0200 Subject: Merge QCameraExposure into QCamera As per API review, let's only have one class for QCamera. Change-Id: I663e238e93ffd83708821e46f8f154c1fdc07731 Reviewed-by: Volker Hilsheimer --- src/multimedia/platform/qnx/camera/bbcameraexposurecontrol_p.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/multimedia/platform/qnx/camera/bbcameraexposurecontrol_p.h') 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 -- cgit v1.2.3