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>

2 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
index 13a8cdbbb..82250b654 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
+++ b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
@@ -384,7 +384,7 @@ void QAndroidMediaPlayerControl::setMedia(const QMediaContent &mediaContent,
 
         if ((mMediaPlayer->display() == 0) && mVideoOutput)
             mMediaPlayer->setDisplay(mVideoOutput->surfaceTexture());
-        mMediaPlayer->setDataSource(mediaContent.canonicalRequest());
+        mMediaPlayer->setDataSource(mediaContent.request());
         mMediaPlayer->prepareAsync();
     }
 
diff --git a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp
index 1185e63dc..ef86af896 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp
+++ b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp
@@ -126,7 +126,7 @@ void QAndroidMetaDataReaderControl::onUpdateMetaData()
     if (m_mediaContent.isNull())
         return;
 
-    const QUrl &url = m_mediaContent.canonicalUrl();
+    const QUrl &url = m_mediaContent.request().url();
     QtConcurrent::run(&extractMetadata, this, url);
 }
 
@@ -134,7 +134,7 @@ void QAndroidMetaDataReaderControl::updateData(const QVariantMap &metadata, cons
 {
     const QMutexLocker l(&m_mtx);
 
-    if (m_mediaContent.canonicalUrl() != url)
+    if (m_mediaContent.request().url() != url)
         return;
 
     const bool oldAvailable = m_available;