From 5ed9d1d830b90c5d5093cc7ca4a5c7cd5b15240c Mon Sep 17 00:00:00 2001 From: VaL Doroshchuk Date: Wed, 24 Apr 2019 10:56:24 +0200 Subject: Deprecate canonicalUrl and canonicalRequest in QMediaContent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/imports/multimedia/qdeclarativeplaylist.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/imports/multimedia') diff --git a/src/imports/multimedia/qdeclarativeplaylist.cpp b/src/imports/multimedia/qdeclarativeplaylist.cpp index b768f99e3..400e23467 100644 --- a/src/imports/multimedia/qdeclarativeplaylist.cpp +++ b/src/imports/multimedia/qdeclarativeplaylist.cpp @@ -232,7 +232,7 @@ void QDeclarativePlaylist::setPlaybackMode(PlaybackMode mode) */ QUrl QDeclarativePlaylist::currentItemSource() const { - return m_playlist->currentMedia().canonicalUrl(); + return m_playlist->currentMedia().request().url(); } /*! @@ -316,7 +316,7 @@ QString QDeclarativePlaylist::errorString() const */ QUrl QDeclarativePlaylist::itemSource(int index) { - return m_playlist->media(index).canonicalUrl(); + return m_playlist->media(index).request().url(); } /*! @@ -548,7 +548,7 @@ QVariant QDeclarativePlaylist::data(const QModelIndex &index, int role) const if (!index.isValid()) return QVariant(); - return m_playlist->media(index.row()).canonicalUrl(); + return m_playlist->media(index.row()).request().url(); } QHash QDeclarativePlaylist::roleNames() const -- cgit v1.2.3