From e0f673784160cf9aae8d25c2e70571c3f9979368 Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Tue, 29 Jun 2021 09:01:17 +0200 Subject: [PATCH] (#6030) add qt5::x11extras module * add qt5::x11extras module * use get_safe for qtx11extras flag * Update recipes/qt/5.x.x/conanfile.py Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com> * Update recipes/qt/5.x.x/conanfile.py Co-authored-by: Anonymous Maarten Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Co-authored-by: Anonymous Maarten --- recipes/qt/5.x.x/conanfile.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index 04c3d8cf4bd53..45d4273c9d1fe 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -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 @@ -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