diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-04-06 11:18:51 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-04-06 13:19:15 +0200 |
| commit | a7868de41810a1cc2653896ef2d788a74dccd586 (patch) | |
| tree | 349afac84c7facdfa20d1abce310d4cf1440269f /src/multimedia/playback/qmediaplayer.h | |
| parent | e2c2b21e530276c216cddf641cf9c0f8098b16ce (diff) | |
Remove use of bearer management and the related deprecated classes
It's now been deleted in QtBase.
Task-number: QTBUG-76502
Change-Id: I4dcefa842d66b3444c097315cf7deff5399d6bd9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Diffstat (limited to 'src/multimedia/playback/qmediaplayer.h')
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index bd070328b..decc61511 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -46,8 +46,6 @@ #include <QtMultimedia/qmediaenumdebug.h> #include <QtMultimedia/qaudio.h> -#include <QtNetwork/qnetworkconfiguration.h> - QT_BEGIN_NAMESPACE @@ -158,11 +156,6 @@ public: Error error() const; QString errorString() const; -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - QT_DEPRECATED_VERSION_5_15 QNetworkConfiguration currentNetworkConfiguration() const; -QT_WARNING_POP - QMultimedia::AvailabilityStatus availability() const override; QAudio::Role audioRole() const; @@ -186,15 +179,6 @@ public Q_SLOTS: void setMedia(const QMediaContent &media, QIODevice *stream = nullptr); void setPlaylist(QMediaPlaylist *playlist); -#ifndef Q_MOC_RUN // moc fails to parse the expanded macro -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED -#endif - QT_DEPRECATED_VERSION_5_15 void setNetworkConfigurations(const QList<QNetworkConfiguration> &configurations); -#ifndef Q_MOC_RUN // moc fails to parse the expanded macro -QT_WARNING_POP -#endif - Q_SIGNALS: void mediaChanged(const QMediaContent &media); void currentMediaChanged(const QMediaContent &media); @@ -220,14 +204,6 @@ Q_SIGNALS: void error(QMediaPlayer::Error error); -#ifndef Q_MOC_RUN // moc fails to parse the expanded macro -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED -#endif - QT_DEPRECATED_VERSION_5_15 void networkConfigurationChanged(const QNetworkConfiguration &configuration); -#ifndef Q_MOC_RUN // moc fails to parse the expanded macro -QT_WARNING_POP -#endif public: bool bind(QObject *) override; void unbind(QObject *) override; |