4 files changed, 26 insertions, 14 deletions

diff --git a/src/multimedia/playback/qmediacontent.cpp b/src/multimedia/playback/qmediacontent.cpp
index 95116d02f..f61511f1c 100644
--- a/src/multimedia/playback/qmediacontent.cpp
+++ b/src/multimedia/playback/qmediacontent.cpp
@@ -123,8 +123,7 @@ private:
     which provides the URL of the content.
 
     A non-null QMediaContent will always have a reference to
-    the content available through the canonicalUrl() or canonicalRequest()
-    methods.
+    the content available through the request() method.
 
     Alternatively QMediaContent can represent a playlist and contain a pointer to a
     valid QMediaPlaylist object. In this case URL is optional and can either be empty
@@ -258,25 +257,34 @@ bool QMediaContent::isNull() const
     return d.constData() == nullptr;
 }
 
+QNetworkRequest QMediaContent::request() const
+{
+    return (d && !d->requests.isEmpty()) ? d->requests.first() : QNetworkRequest();
+}
+
+#if QT_DEPRECATED_SINCE(6, 0)
 /*!
+    \obsolete
+
     Returns a QUrl that represents that canonical resource for this media content.
 */
 
 QUrl QMediaContent::canonicalUrl() const
 {
-    return canonicalRequest().url();
+    return request().url();
 }
 
 /*!
+    \obsolete
+
     Returns a QNetworkRequest that represents that canonical resource for this media content.
 */
 
 QNetworkRequest QMediaContent::canonicalRequest() const
 {
-    return (d && !d->requests.isEmpty()) ? d->requests.first() : QNetworkRequest();
+    return request();
 }
 
-#if QT_DEPRECATED_SINCE(6, 0)
 /*!
     \obsolete
 
diff --git a/src/multimedia/playback/qmediacontent.h b/src/multimedia/playback/qmediacontent.h
index 5193a1fcc..244715b41 100644
--- a/src/multimedia/playback/qmediacontent.h
+++ b/src/multimedia/playback/qmediacontent.h
@@ -72,10 +72,11 @@ public:
     bool operator!=(const QMediaContent &other) const;
 
     bool isNull() const;
+    QNetworkRequest request() const;
 
-    QUrl canonicalUrl() const;
-    QNetworkRequest canonicalRequest() const;
 #if QT_DEPRECATED_SINCE(6, 0)
+    QT_DEPRECATED_X("Use QMediaContent::request().url()") QUrl canonicalUrl() const;
+    QT_DEPRECATED_X("Use QMediaContent::request()") QNetworkRequest canonicalRequest() const;
     QT_DEPRECATED QMediaResource canonicalResource() const;
     QT_DEPRECATED QMediaResourceList resources() const;
 #endif
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 81d525ea8..6ff3fc7df 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -183,7 +183,7 @@ bool QMediaPlayerPrivate::isInChain(const QUrl &url)
     // Check whether a URL is already in the chain of playlists.
     // Also see a comment in parentPlaylist().
     for (QMediaPlaylist *current = rootMedia.playlist(); current && current != playlist; current = current->currentMedia().playlist())
-        if (current->currentMedia().canonicalUrl() == url) {
+        if (current->currentMedia().request().url() == url) {
             return true;
         }
     return false;
@@ -345,10 +345,10 @@ void QMediaPlayerPrivate::setMedia(const QMediaContent &media, QIODevice *stream
     // Backends can't play qrc files directly.
     // If the backend supports StreamPlayback, we pass a QFile for that resource.
     // If it doesn't, we copy the data to a temporary file and pass its path.
-    if (!media.isNull() && !stream && media.canonicalUrl().scheme() == QLatin1String("qrc")) {
+    if (!media.isNull() && !stream && media.request().url().scheme() == QLatin1String("qrc")) {
         qrcMedia = media;
 
-        file.reset(new QFile(QLatin1Char(':') + media.canonicalUrl().path()));
+        file.reset(new QFile(QLatin1Char(':') + media.request().url().path()));
         if (!file->open(QFile::ReadOnly)) {
             QMetaObject::invokeMethod(q, "_q_error", Qt::QueuedConnection,
                                       Q_ARG(int, QMediaPlayer::ResourceError),
@@ -464,11 +464,14 @@ void QMediaPlayerPrivate::loadPlaylist()
 
     // Do not load a playlist if there are more than MAX_NESTED_PLAYLISTS in the chain already,
     // or if the playlist URL is already in the chain, i.e. do not allow recursive playlists and loops.
-    if (nestedPlaylists < MAX_NESTED_PLAYLISTS && !q->currentMedia().canonicalUrl().isEmpty() && !isInChain(q->currentMedia().canonicalUrl())) {
-        pendingPlaylist = QMediaContent(new QMediaPlaylist, q->currentMedia().canonicalUrl(), true);
+    if (nestedPlaylists < MAX_NESTED_PLAYLISTS
+        && !q->currentMedia().request().url().isEmpty()
+        && !isInChain(q->currentMedia().request().url()))
+    {
+        pendingPlaylist = QMediaContent(new QMediaPlaylist, q->currentMedia().request().url(), true);
         QObject::connect(pendingPlaylist.playlist(), SIGNAL(loaded()), q, SLOT(_q_handlePlaylistLoaded()));
         QObject::connect(pendingPlaylist.playlist(), SIGNAL(loadFailed()), q, SLOT(_q_handlePlaylistLoadFailed()));
-        pendingPlaylist.playlist()->load(pendingPlaylist.canonicalRequest());
+        pendingPlaylist.playlist()->load(pendingPlaylist.request());
     } else if (playlist) {
         playlist->next();
     }
diff --git a/src/multimedia/playback/qplaylistfileparser.cpp b/src/multimedia/playback/qplaylistfileparser.cpp
index 92e7f97e8..9af447032 100644
--- a/src/multimedia/playback/qplaylistfileparser.cpp
+++ b/src/multimedia/playback/qplaylistfileparser.cpp
@@ -504,7 +504,7 @@ void QPlaylistFileParser::start(const QMediaContent &media, QIODevice *stream, c
     if (stream)
         start(stream, mimeType);
     else
-        start(media.canonicalRequest(), mimeType);
+        start(media.request(), mimeType);
 }
 
 void QPlaylistFileParser::start(QIODevice *stream, const QString &mimeType)