diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-14 03:00:58 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-14 03:00:58 +0200 |
| commit | 457181d73c5bc188cfea13e13dbe930de3b993d3 (patch) | |
| tree | 284ad58d191f7defd07c55393c426499c9970f6f /tests/auto/unit | |
| parent | d5a1385c7df4714df571d7f80916708b47767a57 (diff) | |
| parent | 7bd13d3f98a6f1f9cf7aed122fd2f301fbae9d62 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I9687c59d15cd816969f362d72b19f279a1a2d04e
Diffstat (limited to 'tests/auto/unit')
| -rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcameraflashcontrol.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/unit/qmultimedia_common/mockcameraflashcontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraflashcontrol.h index daa9f28b6..96e2ebc52 100644 --- a/tests/auto/unit/qmultimedia_common/mockcameraflashcontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcameraflashcontrol.h @@ -59,9 +59,9 @@ public: bool isFlashModeSupported(QCameraExposure::FlashModes mode) const { - return (mode || (QCameraExposure::FlashAuto | QCameraExposure::FlashOff | QCameraExposure::FlashOn | - QCameraExposure::FlashFill |QCameraExposure::FlashTorch |QCameraExposure::FlashSlowSyncFrontCurtain | - QCameraExposure::FlashRedEyeReduction)); + return (mode & (QCameraExposure::FlashAuto | QCameraExposure::FlashOff | QCameraExposure::FlashOn | + QCameraExposure::FlashFill |QCameraExposure::FlashTorch |QCameraExposure::FlashSlowSyncFrontCurtain | + QCameraExposure::FlashRedEyeReduction)); } bool isFlashReady() const |