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

Change-Id: Icaf645e271b21320c4cb6269178d9e722092a263

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index 6921d46e5..9a0a2d9c1 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -60,6 +60,7 @@ private slots:
     void construction();
     void loadMedia();
     void unloadMedia();
+    void loadMediaInLoadingState();
     void playPauseStop();
     void processEOS();
     void deleteLaterAtEOS();
@@ -304,6 +305,16 @@ void tst_QMediaPlayerBackend::unloadMedia()
     QVERIFY(!positionSpy.isEmpty());
 }
 
+void tst_QMediaPlayerBackend::loadMediaInLoadingState()
+{
+    const QUrl url("http://unavailable.media/");
+    QMediaPlayer player;
+    player.setMedia(QMediaContent(url));
+    player.play();
+    // Sets new media while old has not been finished.
+    player.setMedia(QMediaContent(url));
+    QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::InvalidMedia);
+}
 
 void tst_QMediaPlayerBackend::playPauseStop()
 {