diff options
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/configure.json | 2 | ||||
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json index ca6c426ba..6d56af5ed 100644 --- a/src/multimedia/configure.json +++ b/src/multimedia/configure.json @@ -231,7 +231,7 @@ }, "gpu_vivante": { "label": "Vivante GPU", - "condition": "features.opengles2 && tests.gpu_vivante", + "condition": "features.gui && features.opengles2 && tests.gpu_vivante", "output": [ "privateFeature" ] }, "resourcepolicy": { diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 3308537a9..81d525ea8 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -648,6 +648,9 @@ QMediaPlayer::~QMediaPlayer() Q_D(QMediaPlayer); d->disconnectPlaylist(); + // Disconnect everything to prevent notifying + // when a receiver is already destroyed. + disconnect(); if (d->service) { if (d->control) |