diff options
| author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-04-24 10:56:24 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-05-13 09:42:53 +0000 |
| commit | 5ed9d1d830b90c5d5093cc7ca4a5c7cd5b15240c (patch) | |
| tree | a316240590730ef6f7b8625e71b95fd0d5c2835a /src/multimedia/playback/qmediacontent.h | |
| parent | f0f354f2a1eec54733c871bf735f67e0c4ea945c (diff) | |
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>
Diffstat (limited to 'src/multimedia/playback/qmediacontent.h')
| -rw-r--r-- | src/multimedia/playback/qmediacontent.h | 5 |
1 files changed, 3 insertions, 2 deletions
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 |