summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia/qdeclarativecamerafocus.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-03-01 16:51:18 +0100
committerLars Knoll <lars.knoll@qt.io>2021-03-16 07:41:30 +0000
commite7702afc9dfa6e69b1b05d68a38248ccc6b6dd87 (patch)
tree8d8cfbd6b2ac894dcbb250d9084c7cff099a0b65 /src/imports/multimedia/qdeclarativecamerafocus.cpp
parent7ac9e201ab41f76763477821216665d474ce5ec6 (diff)
Simplify state handling in QCamera and QMediaRecorder
Remove the loaded/unloaded states. Instead simply have a boolean indicating whether the camera is active. Change-Id: I1dad15f2c4f2f606f6d64320cea3763d1213a09b Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamerafocus.cpp')
-rw-r--r--src/imports/multimedia/qdeclarativecamerafocus.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp
index 0a50b12f8..51a3a87e3 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus.cpp
+++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp
@@ -97,10 +97,8 @@ QDeclarativeCameraFocus::QDeclarativeCameraFocus(QCamera *camera, QObject *paren
m_focus = camera->focus();
connect(camera, &QCamera::statusChanged, [this](QCamera::Status status) {
- if (status != QCamera::UnloadedStatus && status != QCamera::LoadedStatus
- && status != QCamera::ActiveStatus) {
+ if (status != QCamera::InactiveStatus && status != QCamera::ActiveStatus)
return;
- }
emit supportedFocusModeChanged();
});