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

Jump to bottom

add qt5::x11extras module #6030

Merged
merged 4 commits into from
Jun 29, 2021
Merged

add qt5::x11extras module #6030

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68b8add
add qt5::x11extras module
AndreyMlashkin Jun 22, 2021
3959e9f
use get_safe for qtx11extras flag
AndreyMlashkin Jun 23, 2021
262a27d
Update recipes/qt/5.x.x/conanfile.py
AndreyMlashkin Jun 23, 2021
407beb5
Update recipes/qt/5.x.x/conanfile.py
AndreyMlashkin Jun 24, 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
7 changes: 6 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 @@ -206,9 +206,11 @@ def configure(self):
del self.options.with_libalsa
del self.options.with_openal

if tools.os_info.is_linux:
if self.settings.os in ("FreeBSD", "Linux"):
if self.options.qtwebengine:
self.options.with_fontconfig = True
else:
del self.options.qtx11extras

if self.options.multiconfiguration:
del self.settings.build_type
Expand Down Expand Up @@ -1010,6 +1012,9 @@ def _create_plugin(pluginname, libname, type, requires):
if self.options.qtnetworkauth:
_create_module("NetworkAuth", ["Network"])

if self.options.get_safe("qtx11extras"):
_create_module("X11Extras")

if not self.options.shared:
if self.settings.os == "Windows":
self.cpp_info.components["qtCore"].system_libs.append("version") # qtcore requires "GetFileVersionInfoW" and "VerQueryValueW" which are in "Version.lib" library
Expand Down