Deprecate canonicalUrl and canonicalRequest in QMediaContent

Since QMediaContent can contain only one content
and media resources are already deprecated,
canonicalUrl and canonicalRequest are a bit confusing and outdated.

Deprecated and replaced by QMediaContent::request() which already contains the url.

Change-Id: I418006e112f49466b0129bf1e6e1ae629c714538
Reviewed-by: Christian Strømme <christian.stromme@qt.io>

1 files changed, 2 insertions, 6 deletions

diff --git a/src/gsttools/qgstreamerplayercontrol.cpp b/src/gsttools/qgstreamerplayercontrol.cpp
index 73f43f0b9..03350a432 100644
--- a/src/gsttools/qgstreamerplayercontrol.cpp
+++ b/src/gsttools/qgstreamerplayercontrol.cpp
@@ -377,14 +377,10 @@ void QGstreamerPlayerControl::setMedia(const QMediaContent &content, QIODevice *
     m_currentResource = content;
     m_stream = stream;
 
-    QNetworkRequest request;
+    QNetworkRequest request = content.request();
 
-    if (m_stream) {
+    if (m_stream)
         userStreamValid = stream->isOpen() && m_stream->isReadable();
-        request = content.canonicalRequest();
-    } else if (!content.isNull()) {
-        request = content.canonicalRequest();
-    }
 
 #if !QT_CONFIG(gstreamer_app)
     m_session->loadFromUri(request);