Skip to content

Commit

Permalink
(#6030) add qt5::x11extras module
Browse files Browse the repository at this point in the history
* add qt5::x11extras module

* use get_safe for qtx11extras flag

* Update recipes/qt/5.x.x/conanfile.py

Co-authored-by: SpaceIm <[email protected]>

* Update recipes/qt/5.x.x/conanfile.py

Co-authored-by: Anonymous Maarten <[email protected]>

Co-authored-by: SpaceIm <[email protected]>
Co-authored-by: Anonymous Maarten <[email protected]>
  • Loading branch information
3 people authored Jun 29, 2021
1 parent 83cec16 commit e0f6737
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion recipes/qt/5.x.x/conanfile.py
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

0 comments on commit e0f6737

Please sign in to comment.