diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-02 09:50:54 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-02 09:50:54 +0100 |
commit | 4395fed2b35dd12bb9bde5e20d91908d28196a06 (patch) | |
tree | e2388f414f9e7e8b75f7234f1ba23d5c6ce88208 | |
parent | 0a71cf73f1d5cad5b45972a51c4680b55671470e (diff) | |
parent | f4ed0d4178ecdf50cdaca47716a5101a28494157 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Change-Id: I0564f22f9001d373ad03426dd6d9f584fbab7115
-rw-r--r-- | src/multimedia/audio/qsoundeffect_pulse_p.cpp | 3 | ||||
-rw-r--r-- | src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp index a86f22872..981d4c01f 100644 --- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp @@ -369,7 +369,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<QMediaPlayerResourceSetInterface>(); Q_ASSERT(m_resources); 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 |