From e7702afc9dfa6e69b1b05d68a38248ccc6b6dd87 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Mon, 1 Mar 2021 16:51:18 +0100
Subject: 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>
---
 src/imports/multimedia/qdeclarativecamerafocus.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/imports/multimedia/qdeclarativecamerafocus.cpp')

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();
     });
-- 
cgit v1.2.3