Skip to content

Commit

Permalink
(#5997) Bugfix/qt packages not used in requires
Browse files Browse the repository at this point in the history
* [boost] Add 'algorithm' lib #3961

* Revert "[boost] Add 'algorithm' lib #3961"

This reverts commit 5f1419d.

* Fix for 'package require X not used in components requires' for glib2, alsa and openal deps
  • Loading branch information
CAMOBAP authored Jun 26, 2021
1 parent 3d96da9 commit 0f7bb46
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion recipes/qt/5.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"])
Expand Down

0 comments on commit 0f7bb46

Please sign in to comment.