Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1

Change-Id: If65f60670bbfb011363a1b5230253805b3e63553

2 files changed, 74 insertions, 5 deletions

diff --git a/dist/changes-5.10.1 b/dist/changes-5.10.1
new file mode 100644
index 000000000..e76dd2081
--- /dev/null
+++ b/dist/changes-5.10.1
@@ -0,0 +1,72 @@
+Qt 5.10.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.10.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.10 series is binary compatible with the 5.9.x series.
+Applications compiled for 5.9 will continue to run with 5.10.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+This release contains all fixes included in the Qt 5.9.4 release.
+
+****************************************************************************
+*                            Qt 5.10.1 Changes                             *
+****************************************************************************
+
+QtMultimedia
+------------
+
+- [QTBUG-62155] Improved the quality when rendering YUVY and UYVY video frames.
+- [QTBUG-43098] The alpha channel for ARGB32 video frames are now retained.
+- [QTBUG-57197] Fixed media players state reporting when called in a slot.
+- [QTBUG-53099] Fixed sizing issue when rendering to widgets backed by
+  a QOffscreenSurface.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+macOS
+-----
+
+- [QTBUG-49558] Fixed duration updates for HTTP streams.
+
+PulseAudio
+----------
+
+- [QTBUG-65220] Fixed deadlock in QSoundEffect when using PulseAudio
+
+DirectShow
+----------
+
+- [QTBUG-59320] Made it possible to call DirectShow with only QCoreApplication.
+- [QTBUG-51405] Fixed rendering of overlapping MDI subwindows.
+- [QTBUG-64438] Fixed rendering of videos with pixel aspect ration other then 1:1.
+
+WinRT
+-----
+
+- [QTBUG-60904] Enabled the AudioCapture backend on WinRT.
+
+GStreamer
+---------
+
+- [QTBUG-64080] Fixed camera selection logic to handle devices being
+  loaded and unloaded.
+- [QTBUG-64155] Fixed error handling when no input device is provided.
+
+ALSA
+----
+
+- [QTBUG-63007] Improved the latency in QSoundEffect, by not querying the available
+  devices each time a new track got played.
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
index cfac61c01..823cfe408 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
@@ -732,21 +732,18 @@ void CameraBinSession::setState(QCamera::State newState)
     if (newState == m_pendingState)
         return;
 
-    emit pendingStateChanged(newState);
+    m_pendingState = newState;
+    emit pendingStateChanged(m_pendingState);
 
 #if CAMERABIN_DEBUG
     qDebug() << Q_FUNC_INFO << newState;
 #endif
 
     setStateHelper(newState);
-    m_pendingState = newState;
 }
 
 void CameraBinSession::setStateHelper(QCamera::State state)
 {
-    if (state == m_pendingState)
-        return;
-
     switch (state) {
     case QCamera::UnloadedState:
         unload();