Merge remote-tracking branch 'origin/5.10' into dev

 Conflicts:
	.qmake.conf

Change-Id: I5acdc7e0bd3729b80522dfff0f388cf2507fb111

2 files changed, 24 insertions, 2 deletions

diff --git a/tests/auto/integration/qmediaplayerbackend/BLACKLIST b/tests/auto/integration/qmediaplayerbackend/BLACKLIST
index 8aa622881..0a88eef9e 100644
--- a/tests/auto/integration/qmediaplayerbackend/BLACKLIST
+++ b/tests/auto/integration/qmediaplayerbackend/BLACKLIST
@@ -1,8 +1,7 @@
 # QTBUG-46368
 
 osx
-windows 32bit developer-build
-windows 64bit developer-build
+windows
 
 # Media player plugin not built at the moment on this platform
 opensuse-13.1 64bit
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index 9a0a2d9c1..b68bc030a 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -77,6 +77,7 @@ private slots:
     void surfaceTest_data();
     void surfaceTest();
     void metadata();
+    void playerStateAtEOS();
 
 private:
     QMediaContent selectVideoFile(const QStringList& mediaCandidates);
@@ -1412,6 +1413,28 @@ void tst_QMediaPlayerBackend::metadata()
     QVERIFY(player.availableMetaData().isEmpty());
 }
 
+void tst_QMediaPlayerBackend::playerStateAtEOS()
+{
+    if (!isWavSupported())
+        QSKIP("Sound format is not supported");
+
+    QMediaPlayer player;
+
+    bool endOfMediaReceived = false;
+    connect(&player, &QMediaPlayer::mediaStatusChanged, [&](QMediaPlayer::MediaStatus status) {
+        if (status == QMediaPlayer::EndOfMedia) {
+            QCOMPARE(player.state(), QMediaPlayer::StoppedState);
+            endOfMediaReceived = true;
+        }
+    });
+
+    player.setMedia(localWavFile);
+    player.play();
+
+    QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::EndOfMedia);
+    QVERIFY(endOfMediaReceived);
+}
+
 TestVideoSurface::TestVideoSurface(bool storeFrames):
     m_totalFrames(0),
     m_storeFrames(storeFrames)