summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2020-04-21 09:00:49 -0700
committerThiago Macieira <thiago.macieira@intel.com>2020-04-23 04:41:39 -0700
commit3ce4b38a7c6711ea378a56baec84b73da55a9c84 (patch)
treeb259ae3472bab0aa3c4d80be7614beeed5f02870
parente224c37d3494e9294c17223f58d71a33f20ec014 (diff)
Fix warning about QNetworkConfiguration being deprecated
It's going away in Qt 6.0. Task-number: QTBUG-83692 Change-Id: I9709abb1c3734e10a7defffd1607e1160da1e75c Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-rw-r--r--src/multimedia/playback/qmediaplayer.cpp7
1 files changed, 7 insertions, 0 deletions
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<QNetworkConfiguration> &
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:
/*!