diff options
| author | Val Doroshchuk <valentyn.doroshchuk@qt.io> | 2017-11-15 17:16:08 +0100 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2018-11-05 12:17:18 +0000 |
| commit | 2a77249b1954f0c57ab9de41cf96345b9e575ee7 (patch) | |
| tree | 223bb2f66454b4e829a220dd1c0ed2fadad0a0da /src/multimedia/playback/qmediacontent.h | |
| parent | 3ee6d65377cb563d49d81c3adac0523e4ae8a0b9 (diff) | |
Deprecate QMediaResource class
QMediaResource class is now deprecated and should not be used.
Task-number: QTBUG-28850
Change-Id: Ia0ed5937c548d842eb4bf686da2c24db8b100a9d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/multimedia/playback/qmediacontent.h')
| -rw-r--r-- | src/multimedia/playback/qmediacontent.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/multimedia/playback/qmediacontent.h b/src/multimedia/playback/qmediacontent.h index f7c086752..5193a1fcc 100644 --- a/src/multimedia/playback/qmediacontent.h +++ b/src/multimedia/playback/qmediacontent.h @@ -58,8 +58,10 @@ public: QMediaContent(); QMediaContent(const QUrl &contentUrl); QMediaContent(const QNetworkRequest &contentRequest); - QMediaContent(const QMediaResource &contentResource); - QMediaContent(const QMediaResourceList &resources); +#if QT_DEPRECATED_SINCE(6, 0) + QT_DEPRECATED QMediaContent(const QMediaResource &contentResource); + QT_DEPRECATED QMediaContent(const QMediaResourceList &resources); +#endif QMediaContent(const QMediaContent &other); QMediaContent(QMediaPlaylist *playlist, const QUrl &contentUrl = QUrl(), bool takeOwnership = false); ~QMediaContent(); @@ -73,9 +75,10 @@ public: QUrl canonicalUrl() const; QNetworkRequest canonicalRequest() const; - QMediaResource canonicalResource() const; - - QMediaResourceList resources() const; +#if QT_DEPRECATED_SINCE(6, 0) + QT_DEPRECATED QMediaResource canonicalResource() const; + QT_DEPRECATED QMediaResourceList resources() const; +#endif QMediaPlaylist *playlist() const; private: |