Fix tst_qmediacapturesession on macOS

Fix the remaining test failures on macOS:

Increase timeouts in tests, as those often caused failures.
Fix a couple of behaviors in the platform specific code, to
ensure we handle errors correctly.

Pick-to: 6.2
Change-Id: Ib1a0949f5e65a0fb3d0b89a5508631d1faa7cf1e
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 2 insertions, 1 deletions

diff --git a/src/multimedia/platform/darwin/camera/avfcameraservice.mm b/src/multimedia/platform/darwin/camera/avfcameraservice.mm
index 8d75716c9..5c7cc5848 100644
--- a/src/multimedia/platform/darwin/camera/avfcameraservice.mm
+++ b/src/multimedia/platform/darwin/camera/avfcameraservice.mm
@@ -81,10 +81,11 @@ void AVFCameraService::setCamera(QPlatformCamera *camera)
         m_cameraControl->setCaptureSession(nullptr);
 
     m_cameraControl = control;
-    emit cameraChanged();
 
     if (m_cameraControl)
         m_cameraControl->setCaptureSession(this);
+
+    emit cameraChanged();
 }
 
 QPlatformImageCapture *AVFCameraService::imageCapture()