diff options
Diffstat (limited to 'src/multimedia/playback/qmediaplayer.h')
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index bd070328b..c579c7f40 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -158,10 +158,12 @@ public: Error error() const; QString errorString() const; +#ifndef QT_NO_BEARERMANAGEMENT QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED QT_DEPRECATED_VERSION_5_15 QNetworkConfiguration currentNetworkConfiguration() const; QT_WARNING_POP +#endif QMultimedia::AvailabilityStatus availability() const override; @@ -186,6 +188,7 @@ public Q_SLOTS: void setMedia(const QMediaContent &media, QIODevice *stream = nullptr); void setPlaylist(QMediaPlaylist *playlist); +#ifndef QT_NO_BEARERMANAGEMENT #ifndef Q_MOC_RUN // moc fails to parse the expanded macro QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED @@ -194,6 +197,7 @@ QT_WARNING_DISABLE_DEPRECATED #ifndef Q_MOC_RUN // moc fails to parse the expanded macro QT_WARNING_POP #endif +#endif Q_SIGNALS: void mediaChanged(const QMediaContent &media); @@ -220,6 +224,7 @@ Q_SIGNALS: void error(QMediaPlayer::Error error); +#ifndef QT_NO_BEARERMANAGEMENT #ifndef Q_MOC_RUN // moc fails to parse the expanded macro QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED @@ -228,6 +233,7 @@ QT_WARNING_DISABLE_DEPRECATED #ifndef Q_MOC_RUN // moc fails to parse the expanded macro QT_WARNING_POP #endif +#endif public: bool bind(QObject *) override; void unbind(QObject *) override; |