From 2aaa1fb2a003a0ea51f01f3debddc2f58590facc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 14 Feb 2020 16:19:53 +0100 Subject: Deprecate functions taking bearermanagement-related classes Bearer Management is going away [ChangeLog][Deprecation Notice] Functions taking or returning QNetworkConfiguration have been deprecated. Change-Id: Iff2e6c5386e5c6ba9da81067ac643bd1eb0d7500 Reviewed-by: VaL Doroshchuk Reviewed-by: Qt CI Bot Reviewed-by: Timur Pocheptsov --- .../controls/qmedianetworkaccesscontrol.cpp | 2 ++ .../controls/qmedianetworkaccesscontrol.h | 12 +++++++++-- src/multimedia/playback/qmediaplayer.cpp | 5 +++++ src/multimedia/playback/qmediaplayer.h | 24 +++++++++++++++++++--- 4 files changed, 38 insertions(+), 5 deletions(-) (limited to 'src/multimedia') diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp index 07714da62..9d3f14501 100644 --- a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp +++ b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp @@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE \class QMediaNetworkAccessControl \obsolete \brief The QMediaNetworkAccessControl class allows the setting of the Network Access Point for media related activities. + \obsolete \inmodule QtMultimedia @@ -93,6 +94,7 @@ QMediaNetworkAccessControl::~QMediaNetworkAccessControl() /*! \fn QMediaNetworkAccessControl::configurationChanged(const QNetworkConfiguration &configuration) + This signal is emitted when the current active network configuration changes to \a configuration. */ diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.h b/src/multimedia/controls/qmedianetworkaccesscontrol.h index daae4f389..0c14961cf 100644 --- a/src/multimedia/controls/qmedianetworkaccesscontrol.h +++ b/src/multimedia/controls/qmedianetworkaccesscontrol.h @@ -41,6 +41,10 @@ #ifndef QMEDIANETWORKACCESSCONTROL_H #define QMEDIANETWORKACCESSCONTROL_H +#if 0 +#pragma qt_class(QMediaNetworkAccessControl) +#endif + #include #include @@ -48,10 +52,12 @@ QT_BEGIN_NAMESPACE +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED + // Required for QDoc workaround class QString; - -class Q_MULTIMEDIA_EXPORT QMediaNetworkAccessControl : public QMediaControl +class QT_DEPRECATED_VERSION_5_15 Q_MULTIMEDIA_EXPORT QMediaNetworkAccessControl : public QMediaControl { Q_OBJECT public: @@ -71,6 +77,8 @@ protected: #define QMediaNetworkAccessControl_iid "org.qt-project.qt.medianetworkaccesscontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QMediaNetworkAccessControl, QMediaNetworkAccessControl_iid) +QT_WARNING_POP + QT_END_NAMESPACE diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 6f7d9b8bb..0ccc18401 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -732,6 +732,8 @@ void QMediaPlayer::setPlaylist(QMediaPlaylist *playlist) } /*! + \obsolete + Sets the network access points for remote media playback. \a configurations contains, in ascending preferential order, a list of configuration that can be used for network access. @@ -871,6 +873,8 @@ QString QMediaPlayer::errorString() const } /*! + \obsolete + Returns the current network access point in use. If a default contructed QNetworkConfiguration is returned this feature is not available or that none of the @@ -1655,6 +1659,7 @@ QStringList QMediaPlayer::supportedCustomAudioRoles() const /*! \fn void QMediaPlayer::networkConfigurationChanged(const QNetworkConfiguration &configuration) + \obsolete Signal that the active in use network access point has been changed to \a configuration and all subsequent network access will use this \a configuration. */ diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index 7ebed84da..bd070328b 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -40,6 +40,7 @@ #ifndef QMEDIAPLAYER_H #define QMEDIAPLAYER_H +#include #include #include #include @@ -157,7 +158,10 @@ public: Error error() const; QString errorString() const; - QNetworkConfiguration currentNetworkConfiguration() const; +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED + QT_DEPRECATED_VERSION_5_15 QNetworkConfiguration currentNetworkConfiguration() const; +QT_WARNING_POP QMultimedia::AvailabilityStatus availability() const override; @@ -182,7 +186,14 @@ public Q_SLOTS: void setMedia(const QMediaContent &media, QIODevice *stream = nullptr); void setPlaylist(QMediaPlaylist *playlist); - void setNetworkConfigurations(const QList &configurations); +#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 &configurations); +#ifndef Q_MOC_RUN // moc fails to parse the expanded macro +QT_WARNING_POP +#endif Q_SIGNALS: void mediaChanged(const QMediaContent &media); @@ -209,7 +220,14 @@ Q_SIGNALS: void error(QMediaPlayer::Error error); - void networkConfigurationChanged(const QNetworkConfiguration &configuration); +#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; -- cgit v1.2.3