From 363f8b088f59f3e5465198d4c525cc4dbcaa9439 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 22 Jan 2018 15:41:35 +0100 Subject: Doc: Fix name of Multimedia Widgets module Drop spurious 'Quick' added in 7638848d2486e2. Change-Id: If11c55a2654ccea2ba674e0b8a4193f8d2b36610 Reviewed-by: Leena Miettinen --- src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc b/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc index fc5bd6df6..1dc2776db 100644 --- a/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc +++ b/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc @@ -50,7 +50,7 @@ QT += multimediawidgets \section1 Licenses and Attributions -The Qt Quick Multimedia Widgets module is available under commercial licenses from \l{The Qt Company}. +The Qt Multimedia Widgets module is available under commercial licenses from \l{The Qt Company}. In addition, it is available under free software licenses. Since Qt 5.4, these free software licenses are \l{GNU Lesser General Public License, version 3}, or -- cgit v1.2.1 From f4ed0d4178ecdf50cdaca47716a5101a28494157 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 20 Sep 2017 14:39:31 +0200 Subject: PulseAudio: Prevent crash when a sound device cannot be created Change-Id: I74436b9e8903dd3d38926497594ee195f31c81e6 Reviewed-by: Christian Stromme --- src/multimedia/audio/qsoundeffect_pulse_p.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp index 1e9204598..a4861d2a9 100644 --- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp @@ -362,7 +362,8 @@ QSoundEffectPrivate::QSoundEffectPrivate(QObject* parent): pulseDaemon()->ref(); m_ref = new QSoundEffectRef(this); - pa_sample_spec_init(&m_pulseSpec); + if (pulseDaemon()->context()) + pa_sample_spec_init(&m_pulseSpec); m_resources = QMediaResourcePolicy::createResourceSet(); Q_ASSERT(m_resources); -- cgit v1.2.1