From 99db82a99363a8819b7c1600c565d37b48409fbf Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@qt.io>
Date: Sun, 5 Jul 2020 10:54:23 +0200
Subject: Compile with QT_NO_BEARERMANAGEMENT

Change-Id: Ibd23ac674e8ba5c0b2d3cea619d0f823a058baab
Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
---
 src/multimedia/controls/qmedianetworkaccesscontrol.cpp |  4 ++++
 src/multimedia/controls/qmedianetworkaccesscontrol.h   |  3 +++
 src/multimedia/playback/qmediaplayer.cpp               | 13 ++++++++++++-
 src/multimedia/playback/qmediaplayer.h                 |  6 ++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp
index 9d3f14501..bd289cc29 100644
--- a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp
+++ b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp
@@ -39,6 +39,8 @@
 
 #include "qmedianetworkaccesscontrol.h"
 
+#ifndef QT_NO_BEARERMANAGEMENT
+
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -101,4 +103,6 @@ QMediaNetworkAccessControl::~QMediaNetworkAccessControl()
 
 QT_END_NAMESPACE
 
+#endif
+
 #include "moc_qmedianetworkaccesscontrol.cpp"
diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.h b/src/multimedia/controls/qmedianetworkaccesscontrol.h
index 0c14961cf..681ef61b6 100644
--- a/src/multimedia/controls/qmedianetworkaccesscontrol.h
+++ b/src/multimedia/controls/qmedianetworkaccesscontrol.h
@@ -50,6 +50,8 @@
 #include <QtCore/qlist.h>
 #include <QtNetwork/qnetworkconfiguration.h>
 
+#ifndef QT_NO_BEARERMANAGEMENT
+
 QT_BEGIN_NAMESPACE
 
 QT_WARNING_PUSH
@@ -81,5 +83,6 @@ QT_WARNING_POP
 
 QT_END_NAMESPACE
 
+#endif
 
 #endif
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 5bc6e1308..1b8c0df2d 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -116,7 +116,9 @@ public:
         , audioRoleControl(nullptr)
         , customAudioRoleControl(nullptr)
         , playlist(nullptr)
+#ifndef QT_NO_BEARERMANAGEMENT
         , networkAccessControl(nullptr)
+#endif
         , state(QMediaPlayer::StoppedState)
         , status(QMediaPlayer::UnknownMediaStatus)
         , error(QMediaPlayer::NoError)
@@ -133,10 +135,12 @@ public:
 
     QPointer<QObject> videoOutput;
     QMediaPlaylist *playlist;
+#ifndef QT_NO_BEARERMANAGEMENT
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
     QMediaNetworkAccessControl *networkAccessControl;
 QT_WARNING_POP
+#endif
     QVideoSurfaceOutput surfaceOutput;
     QMediaContent qrcMedia;
     QScopedPointer<QFile> qrcFile;
@@ -602,10 +606,12 @@ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags):
         d->error = ServiceMissingError;
     } else {
         d->control = qobject_cast<QMediaPlayerControl*>(d->service->requestControl(QMediaPlayerControl_iid));
+#ifndef QT_NO_BEARERMANAGEMENT
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
         d->networkAccessControl = qobject_cast<QMediaNetworkAccessControl*>(d->service->requestControl(QMediaNetworkAccessControl_iid));
 QT_WARNING_POP
+#endif
         if (d->control != nullptr) {
             connect(d->control, SIGNAL(mediaChanged(QMediaContent)), SLOT(_q_handleMediaChanged(QMediaContent)));
             connect(d->control, SIGNAL(stateChanged(QMediaPlayer::State)), SLOT(_q_stateChanged(QMediaPlayer::State)));
@@ -649,6 +655,7 @@ QT_WARNING_POP
                 }
             }
         }
+#ifndef QT_NO_BEARERMANAGEMENT
         if (d->networkAccessControl != nullptr) {
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
@@ -656,6 +663,7 @@ QT_WARNING_DISABLE_DEPRECATED
                     this, &QMediaPlayer::networkConfigurationChanged);
 QT_WARNING_POP
         }
+#endif
     }
 }
 
@@ -740,6 +748,7 @@ void QMediaPlayer::setPlaylist(QMediaPlaylist *playlist)
     setMedia(m);
 }
 
+#ifndef QT_NO_BEARERMANAGEMENT
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
 /*!
@@ -759,6 +768,7 @@ void QMediaPlayer::setNetworkConfigurations(const QList<QNetworkConfiguration> &
         d->networkAccessControl->setConfigurations(configurations);
 }
 QT_WARNING_POP
+#endif
 
 QMediaPlayer::State QMediaPlayer::state() const
 {
@@ -884,6 +894,7 @@ QString QMediaPlayer::errorString() const
     return d_func()->errorString;
 }
 
+#ifndef QT_NO_BEARERMANAGEMENT
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
 /*!
@@ -904,7 +915,7 @@ QNetworkConfiguration QMediaPlayer::currentNetworkConfiguration() const
     return QNetworkConfiguration();
 }
 QT_WARNING_POP
-
+#endif
 
 //public Q_SLOTS:
 /*!
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;
-- 
cgit v1.2.3