From 3ce4b38a7c6711ea378a56baec84b73da55a9c84 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 21 Apr 2020 09:00:49 -0700 Subject: Fix warning about QNetworkConfiguration being deprecated MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's going away in Qt 6.0. Task-number: QTBUG-83692 Change-Id: I9709abb1c3734e10a7defffd1607e1160da1e75c Reviewed-by: Mårten Nordheim --- src/multimedia/playback/qmediaplayer.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 3773cfe64..276914ae1 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -731,6 +731,8 @@ void QMediaPlayer::setPlaylist(QMediaPlaylist *playlist) setMedia(m); } +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED /*! \obsolete @@ -747,6 +749,7 @@ void QMediaPlayer::setNetworkConfigurations(const QList & if (d->networkAccessControl) d->networkAccessControl->setConfigurations(configurations); } +QT_WARNING_POP QMediaPlayer::State QMediaPlayer::state() const { @@ -872,6 +875,8 @@ QString QMediaPlayer::errorString() const return d_func()->errorString; } +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED /*! \obsolete @@ -889,6 +894,8 @@ QNetworkConfiguration QMediaPlayer::currentNetworkConfiguration() const return QNetworkConfiguration(); } +QT_WARNING_POP + //public Q_SLOTS: /*! -- cgit v1.2.3