Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	qtmultimedia.pro
	src/multimedia/playback/qmediaplayer.cpp
	src/plugins/directshow/directshow.pro
	tests/auto/integration/qmediaplayerbackend/BLACKLIST

Change-Id: I6dacdcbb223c1d12dd72eb308a67170983c709b3

1 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
index 2919648a7..9ecd9b79c 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
@@ -612,18 +612,18 @@ void QGstreamerPlayerControl::popAndNotifyState()
     QMediaPlayer::MediaStatus oldMediaStatus = m_mediaStatusStack.pop();
 
     if (m_stateStack.isEmpty()) {
-        if (m_currentState != oldState) {
+        if (m_mediaStatus != oldMediaStatus) {
 #ifdef DEBUG_PLAYBIN
-            qDebug() << "State changed:" << m_currentState;
+            qDebug() << "Media status changed:" << m_mediaStatus;
 #endif
-            emit stateChanged(m_currentState);
+            emit mediaStatusChanged(m_mediaStatus);
         }
 
-        if (m_mediaStatus != oldMediaStatus) {
+        if (m_currentState != oldState) {
 #ifdef DEBUG_PLAYBIN
-            qDebug() << "Media status changed:" << m_mediaStatus;
+            qDebug() << "State changed:" << m_currentState;
 #endif
-            emit mediaStatusChanged(m_mediaStatus);
+            emit stateChanged(m_currentState);
         }
     }
 }