diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 14:03:06 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 14:03:06 +0200 |
| commit | 89f92578ece66aaa50e03cacd81434cd18006185 (patch) | |
| tree | 75eb009c9f526a78afbfba34d88bbb509600ed2a /src/multimedia/playback/qmediaplayer.cpp | |
| parent | 541440649aac5488a8cb44f0c867095b18405c49 (diff) | |
| parent | 83f0038fa7fd090840fdd19fd30652bd7bbb6fd3 (diff) | |
Merge remote-tracking branch 'origin/5.15.0' into 5.15
Change-Id: I9525c18e6a29b8c6cbe3398264a096bde24eca10
Diffstat (limited to 'src/multimedia/playback/qmediaplayer.cpp')
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 12c84f0f6..5bc6e1308 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -740,6 +740,8 @@ void QMediaPlayer::setPlaylist(QMediaPlaylist *playlist) setMedia(m); } +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED /*! \obsolete @@ -756,6 +758,7 @@ void QMediaPlayer::setNetworkConfigurations(const QList<QNetworkConfiguration> & if (d->networkAccessControl) d->networkAccessControl->setConfigurations(configurations); } +QT_WARNING_POP QMediaPlayer::State QMediaPlayer::state() const { @@ -881,6 +884,8 @@ QString QMediaPlayer::errorString() const return d_func()->errorString; } +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED /*! \obsolete @@ -898,6 +903,8 @@ QNetworkConfiguration QMediaPlayer::currentNetworkConfiguration() const return QNetworkConfiguration(); } +QT_WARNING_POP + //public Q_SLOTS: /*! |