From 0f7bb460dfc63197ed0dacf98a50c7e518374507 Mon Sep 17 00:00:00 2001 From: Alex Bobrikovich Date: Sat, 26 Jun 2021 08:31:27 -0700 Subject: [PATCH] (#5997) Bugfix/qt packages not used in requires * [boost] Add 'algorithm' lib #3961 * Revert "[boost] Add 'algorithm' lib #3961" This reverts commit 5f1419d12a2ff530682826b334c123cddbd7c67c. * Fix for 'package require X not used in components requires' for glib2, alsa and openal deps --- recipes/qt/5.x.x/conanfile.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index 34b397fb31065..104a3e9a104d1 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -794,6 +794,8 @@ def _create_plugin(pluginname, libname, type, requires): core_reqs.append("icu::icu") if self.options.with_zstd: core_reqs.append("zstd::zstd") + if self.options.with_glib: + core_reqs.append("glib::glib-2.0") _create_module("Core", core_reqs) if self.options.gui: @@ -968,7 +970,12 @@ def _create_plugin(pluginname, libname, type, requires): _create_plugin("QXInputGamepadBackendPlugin", "xinputgamepad", "gamepads", []) if self.options.qtmultimedia: - _create_module("Multimedia", ["Network", "Gui", "openal::openal"]) + multimedia_reqs = ["Network", "Gui"] + if self.options.with_libalsa: + multimedia_reqs.append("libalsa::libalsa") + if self.options.with_openal: + multimedia_reqs.append("openal::openal") + _create_module("Multimedia", multimedia_reqs) _create_module("MultimediaWidgets", ["Multimedia", "Widgets", "Gui"]) if self.options.qtdeclarative and self.options.gui: _create_module("MultimediaQuick", ["Multimedia", "Quick"])