diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-04-24 19:01:17 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-04-27 09:01:27 +0200 |
| commit | 24a2c57e23fdee0c22b4f957b3b29ddb754b2699 (patch) | |
| tree | 14d79d0f474d2fd30e92bd9b1e9afc4e460c2c25 /src/multimedia | |
| parent | f3c9161147134bcc848f662947c5a59f3b48e94e (diff) | |
Suppress QMediaNetworkAccessControl related deprecation warnings
Change-Id: Ifb64b01463115f81b2edc4e486a3b0f52197e2a1
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 3773cfe64..12c84f0f6 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -133,7 +133,10 @@ public: QPointer<QObject> videoOutput; QMediaPlaylist *playlist; +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED QMediaNetworkAccessControl *networkAccessControl; +QT_WARNING_POP QVideoSurfaceOutput surfaceOutput; QMediaContent qrcMedia; QScopedPointer<QFile> qrcFile; @@ -599,7 +602,10 @@ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags): d->error = ServiceMissingError; } else { d->control = qobject_cast<QMediaPlayerControl*>(d->service->requestControl(QMediaPlayerControl_iid)); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED d->networkAccessControl = qobject_cast<QMediaNetworkAccessControl*>(d->service->requestControl(QMediaNetworkAccessControl_iid)); +QT_WARNING_POP 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))); @@ -644,8 +650,11 @@ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags): } } if (d->networkAccessControl != nullptr) { +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED connect(d->networkAccessControl, &QMediaNetworkAccessControl::configurationChanged, this, &QMediaPlayer::networkConfigurationChanged); +QT_WARNING_POP } } } |