Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/qt packages not used in requires #5997

Merged
merged 8 commits into from
Jun 26, 2021
Merged

Bugfix/qt packages not used in requires #5997

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5f1419d
[boost] Add 'algorithm' lib #3961
CAMOBAP Dec 21, 2020
99b049c
Merge remote-tracking branch 'upstream/master'
CAMOBAP Apr 3, 2021
89c0a21
Revert "[boost] Add 'algorithm' lib #3961"
CAMOBAP Apr 5, 2021
5b138bc
Merge remote-tracking branch 'upstream/master'
CAMOBAP Apr 10, 2021
87ed6a8
Merge remote-tracking branch 'upstream/master'
CAMOBAP May 29, 2021
49efd36
Merge branch 'conan-io:master' into master
CAMOBAP Jun 20, 2021
25f9752
Merge branch 'conan-io:master' into master
CAMOBAP Jun 21, 2021
047333b
Fix for 'package require X not used in components requires' for glib2…
CAMOBAP Jun 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion recipes/qt/5.x.x/conanfile.py
View file
Open in desktop
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