From 9ceb1c083e4f6911ace1af3c9dfa6b4dd9036586 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Thu, 5 Dec 2013 17:47:49 +0100 Subject: Use the backend to notify the QCamera state changes. We were emitting the stateChanged() signal no matter what was actually done by the backend. QCamera now emits this signal only if the backend actually changed the state. Task-number: QTBUG-35070 Change-Id: I9f32361cd815dbcc366ad30033692f9ae732ec46 Reviewed-by: Christian Stromme --- src/multimedia/camera/qcamera.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index 5b0f0d10d..e91a0318c 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -175,8 +175,6 @@ void QCameraPrivate::_q_error(int error, const QString &errorString) void QCameraPrivate::setState(QCamera::State newState) { - Q_Q(QCamera); - unsetError(); if (!control) { @@ -184,13 +182,8 @@ void QCameraPrivate::setState(QCamera::State newState) return; } - if (state == newState) - return; - restartPending = false; - state = newState; - control->setState(state); - emit q->stateChanged(state); + control->setState(newState); } void QCameraPrivate::_q_updateState(QCamera::State newState) @@ -203,7 +196,6 @@ void QCameraPrivate::_q_updateState(QCamera::State newState) return; if (newState != state) { - qDebug() << "Camera state changed:" << newState; state = newState; emit q->stateChanged(state); } -- cgit v1.2.1