Merge 5.12 into 5.12.1

Change-Id: Ic42cf93c3be21a84d711effae28a3292f2b5c600

2 files changed, 9 insertions, 5 deletions

diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index 76b791e21..25430a189 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -308,13 +308,17 @@ void tst_QMediaPlayerBackend::unloadMedia()
 
 void tst_QMediaPlayerBackend::loadMediaInLoadingState()
 {
-    const QUrl url("http://unavailable.media/");
+    if (!isWavSupported())
+        QSKIP("Sound format is not supported");
+
     QMediaPlayer player;
-    player.setMedia(QMediaContent(url));
+    player.setMedia(localWavFile);
     player.play();
+    QCOMPARE(player.mediaStatus(), QMediaPlayer::LoadingMedia);
     // Sets new media while old has not been finished.
-    player.setMedia(QMediaContent(url));
-    QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::InvalidMedia);
+    player.setMedia(localWavFile);
+    QCOMPARE(player.mediaStatus(), QMediaPlayer::LoadingMedia);
+    QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::LoadedMedia);
 }
 
 void tst_QMediaPlayerBackend::playPauseStop()
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp
index 5c2d3529a..fa5e7187b 100644
--- a/tests/auto/unit/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/qcamera/tst_qcamera.cpp
@@ -1500,7 +1500,7 @@ void tst_QCamera::testCameraLockCancel()
 {
     MockCameraService service;
     provider->service = &service;
-    QCamera camera(0, provider);
+    QCamera camera;
 
     camera.focus()->setFocusMode(QCameraFocus::AutoFocus);