From 86172a759d40b0dc6dc664ba79581bf315526788 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 5 Feb 2019 20:51:21 +0100 Subject: gpu_vivante depends on opengles2 and gui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8317956994f586fa2272d5633af91325d277998b Reviewed-by: Tony Sarajärvi --- src/multimedia/configure.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/multimedia') diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json index 9980b0664..025ff7d66 100644 --- a/src/multimedia/configure.json +++ b/src/multimedia/configure.json @@ -235,7 +235,7 @@ }, "gpu_vivante": { "label": "Vivante GPU", - "condition": "features.opengles2 && tests.gpu_vivante", + "condition": "features.gui && features.opengles2 && tests.gpu_vivante", "output": [ "privateFeature" ] }, "resourcepolicy": { -- cgit v1.2.3 From d6c69017130405d945df7f9bd8b529932b158806 Mon Sep 17 00:00:00 2001 From: VaL Doroshchuk Date: Fri, 9 Nov 2018 15:36:11 +0100 Subject: Fix crash in player example when close the window while playing When it is playing and close the window: 1. The player object will be destroyed first (all QString's). 2. Next parent QWidget will be destroyed with all children. 3. While destroying QMediaPlayer from Player object, the playback will be stopped. 4. The status will be changed and Player::statusChanged will be called. The connection still exists. And since all string members are already freed, it produces a crash. Change-Id: I2c2fdca97f0ff4b300527b550ecc0c12b04e5b4e Reviewed-by: Oliver Wolff --- src/multimedia/playback/qmediaplayer.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/multimedia') diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 19d4ec42c..e90035cce 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) -- cgit v1.2.3