diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-10-13 13:20:18 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-10-14 10:18:59 +0200 |
| commit | b4e22f8d590e4de8a74f2adb8ab95739f6a4c748 (patch) | |
| tree | efd883697ab0de486d7bd6b44a76eb8eac6dab22 | |
| parent | f763920411015ecd259499c5925d1c9043154f05 (diff) | |
Remove autodetection for ALSA and PulseAudio
Those backends are currently broken and do not build. In addition, they
are audio only, and would only provide rather limited multimedia
support.
Fixes: QTBUG-97091
Pick-to: 6.2
Change-Id: I696e133972807ffc149bd1aa37fc44aee13d47dd
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/multimedia/configure.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/multimedia/configure.cmake b/src/multimedia/configure.cmake index 3f41d215c..543529bec 100644 --- a/src/multimedia/configure.cmake +++ b/src/multimedia/configure.cmake @@ -50,6 +50,7 @@ qt_config_compile_test("wmsdk" qt_feature("alsa" PUBLIC PRIVATE LABEL "ALSA" + AUTODETECT false CONDITION UNIX AND NOT QNX AND ALSA_FOUND AND NOT QT_FEATURE_gstreamer AND NOT QT_FEATURE_pulseaudio ) qt_feature_definition("alsa" "QT_NO_ALSA" NEGATE VALUE "1") @@ -100,7 +101,7 @@ qt_feature("mmrenderer" PUBLIC PRIVATE qt_feature_definition("mmrenderer" "QT_NO_MMRENDERER" NEGATE VALUE "1") qt_feature("pulseaudio" PUBLIC PRIVATE LABEL "PulseAudio" - AUTODETECT UNIX + AUTODETECT false CONDITION WrapPulseAudio_FOUND AND NOT QT_FEATURE_gstreamer ) qt_feature_definition("pulseaudio" "QT_NO_PULSEAUDIO" NEGATE VALUE "1") @@ -113,10 +114,10 @@ qt_feature("wmf" PRIVATE CONDITION WIN32 AND WMF_FOUND AND QT_FEATURE_wmsdk ) qt_configure_add_summary_section(NAME "Qt Multimedia") -qt_configure_add_summary_entry(ARGS "alsa") +#qt_configure_add_summary_entry(ARGS "alsa") qt_configure_add_summary_entry(ARGS "gstreamer_1_0") qt_configure_add_summary_entry(ARGS "linux_v4l") -qt_configure_add_summary_entry(ARGS "pulseaudio") +#qt_configure_add_summary_entry(ARGS "pulseaudio") qt_configure_add_summary_entry(ARGS "mmrenderer") qt_configure_add_summary_entry(ARGS "avfoundation") qt_configure_add_summary_entry(ARGS "wmf") |