Remove usages of deprecated APIs

- Replace the usages of deprecated APIs by corresponding
  alternatives.

- Made the tests for deprecated APIs to compile conditionally,
  based on the deprecation version.

Task-number: QTBUG-76491
Task-number: QTBUG-76540
Task-number: QTBUG-76541
Change-Id: Ifd397dae9b3ebc2ba2504db7baa2d8ff21bfb3a7
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>

6 files changed, 57 insertions, 28 deletions

diff --git a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
index b270e93eb..87c72521c 100644
--- a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
+++ b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
@@ -411,17 +411,17 @@ void tst_QDeclarativeAudio::source()
 
     audio.setSource(url1);
     QCOMPARE(audio.source(), url1);
-    QCOMPARE(provider.playerControl()->media().canonicalUrl(), url1);
+    QCOMPARE(provider.playerControl()->media().request().url(), url1);
     QCOMPARE(spy.count(), 1);
 
     audio.setSource(url2);
     QCOMPARE(audio.source(), url2);
-    QCOMPARE(provider.playerControl()->media().canonicalUrl(), url2);
+    QCOMPARE(provider.playerControl()->media().request().url(), url2);
     QCOMPARE(spy.count(), 2);
 
     audio.setSource(url3);
     QCOMPARE(audio.source(), url3);
-    QCOMPARE(provider.playerControl()->media().canonicalUrl(), url3);
+    QCOMPARE(provider.playerControl()->media().request().url(), url3);
     QCOMPARE(spy.count(), 3);
 }
 
diff --git a/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp b/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp
index d10257c19..3c68a32b1 100644
--- a/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp
+++ b/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp
@@ -43,12 +43,16 @@ private slots:
     void testNull();
     void testUrlCtor();
     void testRequestCtor();
+#if QT_DEPRECATED_SINCE(6, 0)
     void testResourceCtor();
     void testResourceListCtor();
+#endif
     void testCopy();
     void testAssignment();
     void testEquality();
+#if QT_DEPRECATED_SINCE(6, 0)
     void testResources();
+#endif
     void testPlaylist();
 };
 
@@ -57,17 +61,23 @@ void tst_QMediaContent::testNull()
     QMediaContent media;
 
     QCOMPARE(media.isNull(), true);
+    QCOMPARE(media.request().url(), QUrl());
+#if QT_DEPRECATED_SINCE(6, 0)
     QCOMPARE(media.canonicalUrl(), QUrl());
     QCOMPARE(media.canonicalResource(), QMediaResource());
     QCOMPARE(media.resources(), QMediaResourceList());
+#endif
 }
 
 void tst_QMediaContent::testUrlCtor()
 {
     QMediaContent media(QUrl("http://example.com/movie.mov"));
+    QCOMPARE(media.request().url(), QUrl("http://example.com/movie.mov"));
 
+#if QT_DEPRECATED_SINCE(6, 0)
     QCOMPARE(media.canonicalUrl(), QUrl("http://example.com/movie.mov"));
     QCOMPARE(media.canonicalResource().url(), QUrl("http://example.com/movie.mov"));
+#endif
 }
 
 void tst_QMediaContent::testRequestCtor()
@@ -76,13 +86,18 @@ void tst_QMediaContent::testRequestCtor()
     request.setAttribute(QNetworkRequest::User, QVariant(1234));
 
     QMediaContent media(request);
+    QCOMPARE(media.request().url(), QUrl("http://example.com/movie.mov"));
+    QCOMPARE(media.request(), request);
 
+#if QT_DEPRECATED_SINCE(6, 0)
     QCOMPARE(media.canonicalUrl(), QUrl("http://example.com/movie.mov"));
     QCOMPARE(media.canonicalRequest(),request);
     QCOMPARE(media.canonicalResource().request(), request);
     QCOMPARE(media.canonicalResource().url(), QUrl("http://example.com/movie.mov"));
+#endif
 }
 
+#if QT_DEPRECATED_SINCE(6, 0)
 void tst_QMediaContent::testResourceCtor()
 {
     QMediaContent media(QMediaResource(QUrl("http://example.com/movie.mov")));
@@ -100,10 +115,11 @@ void tst_QMediaContent::testResourceListCtor()
     QCOMPARE(media.canonicalUrl(), QUrl("http://example.com/movie.mov"));
     QCOMPARE(media.canonicalResource().url(), QUrl("http://example.com/movie.mov"));
 }
+#endif
 
 void tst_QMediaContent::testCopy()
 {
-    QMediaContent media1(QMediaResource(QUrl("http://example.com/movie.mov")));
+    QMediaContent media1(QUrl("http://example.com/movie.mov"));
     QMediaContent media2(media1);
 
     QVERIFY(media1 == media2);
@@ -111,7 +127,7 @@ void tst_QMediaContent::testCopy()
 
 void tst_QMediaContent::testAssignment()
 {
-    QMediaContent media1(QMediaResource(QUrl("http://example.com/movie.mov")));
+    QMediaContent media1(QUrl("http://example.com/movie.mov"));
     QMediaContent media2;
     QMediaContent media3;
 
@@ -126,9 +142,9 @@ void tst_QMediaContent::testEquality()
 {
     QMediaContent media1;
     QMediaContent media2;
-    QMediaContent media3(QMediaResource(QUrl("http://example.com/movie.mov")));
-    QMediaContent media4(QMediaResource(QUrl("http://example.com/movie.mov")));
-    QMediaContent media5(QMediaResource(QUrl("file:///some/where/over/the/rainbow.mp3")));
+    QMediaContent media3(QUrl("http://example.com/movie.mov"));
+    QMediaContent media4(QUrl("http://example.com/movie.mov"));
+    QMediaContent media5(QUrl("file:///some/where/over/the/rainbow.mp3"));
 
     // null == null
     QCOMPARE(media1 == media2, true);
@@ -147,6 +163,7 @@ void tst_QMediaContent::testEquality()
     QCOMPARE(media4 != media5, true);
 }
 
+#if QT_DEPRECATED_SINCE(6, 0)
 void tst_QMediaContent::testResources()
 {
     QMediaResourceList  resourceList;
@@ -160,17 +177,18 @@ void tst_QMediaContent::testResources()
     QCOMPARE(res[0], QMediaResource(QUrl("http://example.com/movie-main.mov")));
     QCOMPARE(res[1], QMediaResource(QUrl("http://example.com/movie-big.mov")));
 }
+#endif
 
 void tst_QMediaContent::testPlaylist()
 {
     QMediaContent media(QUrl("http://example.com/movie.mov"));
-    QVERIFY(media.canonicalUrl().isValid());
+    QVERIFY(media.request().url().isValid());
     QVERIFY(!media.playlist());
 
     {
         QPointer<QMediaPlaylist> playlist(new QMediaPlaylist);
         media = QMediaContent(playlist.data(), QUrl("http://example.com/sample.m3u"), true);
-        QVERIFY(media.canonicalUrl().isValid());
+        QVERIFY(media.request().url().isValid());
         QCOMPARE(media.playlist(), playlist.data());
         media = QMediaContent();
         // Make sure playlist is destroyed by QMediaContent
@@ -189,7 +207,7 @@ void tst_QMediaContent::testPlaylist()
     {
         QPointer<QMediaPlaylist> playlist(new QMediaPlaylist);
         media = QMediaContent(playlist.data(), QUrl(), false);
-        QVERIFY(!media.canonicalUrl().isValid());
+        QVERIFY(!media.request().url().isValid());
         QCOMPARE(media.playlist(), playlist.data());
         media = QMediaContent();
         QVERIFY(playlist);
diff --git a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp
index 871ff3cc7..f2b993722 100644
--- a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp
+++ b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp
@@ -1293,7 +1293,7 @@ void tst_QMediaPlayer::testQrc()
     }
 
     // Check the media actually passed to the backend
-    QCOMPARE(mockService->mockControl->media().canonicalUrl().scheme(), backendMediaContentScheme);
+    QCOMPARE(mockService->mockControl->media().request().url().scheme(), backendMediaContentScheme);
     QCOMPARE(bool(mockService->mockControl->mediaStream()), backendHasStream);
 }
 
diff --git a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
index 3a59823ca..9b1385dac 100644
--- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
+++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
@@ -542,19 +542,19 @@ void tst_QMediaPlaylist::loadM3uFile()
     QCOMPARE(playlist.error(), QMediaPlaylist::NoError);
     QCOMPARE(playlist.mediaCount(), 7);
 
-    QCOMPARE(playlist.media(0).canonicalUrl(), QUrl(QLatin1String("http://test.host/path")));
-    QCOMPARE(playlist.media(1).canonicalUrl(), QUrl(QLatin1String("http://test.host/path")));
+    QCOMPARE(playlist.media(0).request().url(), QUrl(QLatin1String("http://test.host/path")));
+    QCOMPARE(playlist.media(1).request().url(), QUrl(QLatin1String("http://test.host/path")));
     testFileName = QFINDTESTDATA("testdata/testfile");
-    QCOMPARE(playlist.media(2).canonicalUrl(),
+    QCOMPARE(playlist.media(2).request().url(),
              QUrl::fromLocalFile(testFileName));
     testFileName = QFINDTESTDATA("testdata");
-    QCOMPARE(playlist.media(3).canonicalUrl(),
+    QCOMPARE(playlist.media(3).request().url(),
              QUrl::fromLocalFile(testFileName + "/testdir/testfile"));
-    QCOMPARE(playlist.media(4).canonicalUrl(), QUrl(QLatin1String("file:///testdir/testfile")));
-    QCOMPARE(playlist.media(5).canonicalUrl(), QUrl(QLatin1String("file://path/name#suffix")));
+    QCOMPARE(playlist.media(4).request().url(), QUrl(QLatin1String("file:///testdir/testfile")));
+    QCOMPARE(playlist.media(5).request().url(), QUrl(QLatin1String("file://path/name#suffix")));
     //ensure #2 suffix is not stripped from path
     testFileName = QFINDTESTDATA("testdata/testfile2#suffix");
-    QCOMPARE(playlist.media(6).canonicalUrl(), QUrl::fromLocalFile(testFileName));
+    QCOMPARE(playlist.media(6).request().url(), QUrl::fromLocalFile(testFileName));
 
     // check ability to load from QNetworkRequest
     loadSpy.clear();
@@ -597,19 +597,19 @@ void tst_QMediaPlaylist::loadPLSFile()
     QCOMPARE(playlist.error(), QMediaPlaylist::NoError);
     QCOMPARE(playlist.mediaCount(), 7);
 
-    QCOMPARE(playlist.media(0).canonicalUrl(), QUrl(QLatin1String("http://test.host/path")));
-    QCOMPARE(playlist.media(1).canonicalUrl(), QUrl(QLatin1String("http://test.host/path")));
+    QCOMPARE(playlist.media(0).request().url(), QUrl(QLatin1String("http://test.host/path")));
+    QCOMPARE(playlist.media(1).request().url(), QUrl(QLatin1String("http://test.host/path")));
     testFileName = QFINDTESTDATA("testdata/testfile");
-    QCOMPARE(playlist.media(2).canonicalUrl(),
+    QCOMPARE(playlist.media(2).request().url(),
              QUrl::fromLocalFile(testFileName));
     testFileName = QFINDTESTDATA("testdata");
-    QCOMPARE(playlist.media(3).canonicalUrl(),
+    QCOMPARE(playlist.media(3).request().url(),
              QUrl::fromLocalFile(testFileName + "/testdir/testfile"));
-    QCOMPARE(playlist.media(4).canonicalUrl(), QUrl(QLatin1String("file:///testdir/testfile")));
-    QCOMPARE(playlist.media(5).canonicalUrl(), QUrl(QLatin1String("file://path/name#suffix")));
+    QCOMPARE(playlist.media(4).request().url(), QUrl(QLatin1String("file:///testdir/testfile")));
+    QCOMPARE(playlist.media(5).request().url(), QUrl(QLatin1String("file://path/name#suffix")));
     //ensure #2 suffix is not stripped from path
     testFileName = QFINDTESTDATA("testdata/testfile2#suffix");
-    QCOMPARE(playlist.media(6).canonicalUrl(), QUrl::fromLocalFile(testFileName));
+    QCOMPARE(playlist.media(6).request().url(), QUrl::fromLocalFile(testFileName));
 
     // Try to load a totem-pl generated playlist
     // (Format doesn't respect the spec)
@@ -622,7 +622,7 @@ void tst_QMediaPlaylist::loadPLSFile()
     QVERIFY(loadFailedSpy.isEmpty());
     QCOMPARE(playlist.error(), QMediaPlaylist::NoError);
     QCOMPARE(playlist.mediaCount(), 1);
-    QCOMPARE(playlist.media(0).canonicalUrl(), QUrl(QLatin1String("http://test.host/path")));
+    QCOMPARE(playlist.media(0).request().url(), QUrl(QLatin1String("http://test.host/path")));
 
 
     // check ability to load from QNetworkRequest
diff --git a/tests/auto/unit/qmediaresource/tst_qmediaresource.cpp b/tests/auto/unit/qmediaresource/tst_qmediaresource.cpp
index cfb6b44e9..786570bec 100644
--- a/tests/auto/unit/qmediaresource/tst_qmediaresource.cpp
+++ b/tests/auto/unit/qmediaresource/tst_qmediaresource.cpp
@@ -37,6 +37,7 @@ class tst_QMediaResource : public QObject
 {
     Q_OBJECT
 private slots:
+#if QT_DEPRECATED_SINCE(6, 0)
     void constructNull();
     void construct_data();
     void construct();
@@ -47,8 +48,15 @@ private slots:
 
     void constructorRequest();
     void copyConstructor();
+#else
+    void initTestCase()
+    {
+        QSKIP("Skipping this test, QMediaResource is deprecated.");
+    }
+#endif
 };
 
+#if QT_DEPRECATED_SINCE(6, 0)
 void tst_QMediaResource::constructNull()
 {
     QMediaResource resource;
@@ -682,6 +690,8 @@ void tst_QMediaResource::copyConstructor()
     QCOMPARE(original1 == copy1, true);
 }
 
+#endif // QT_DEPRECATED_SINCE(6, 0)
+
 QTEST_MAIN(tst_QMediaResource)
 
 #include "tst_qmediaresource.moc"
diff --git a/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h b/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h
index 229f70ea8..cc56e9adb 100644
--- a/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h
@@ -82,7 +82,8 @@ public:
         bool bMediaContentChanged = false;
         int i = 0;
         for (; i < playlistProvider()->mediaCount(); i++) {
-            if (playlistProvider()->media(i).canonicalUrl().toString() != newProvider->media(i).canonicalUrl().toString()) {
+            if (playlistProvider()->media(i).request().url().toString()
+                    != newProvider->media(i).request().url().toString()) {
                 bMediaContentChanged = true;
                 break;
             }