From 68b8add28a2acde826a69b1b0587ec60aaf3ee21 Mon Sep 17 00:00:00 2001 From: "andrei.malashkin" Date: Wed, 23 Jun 2021 00:42:18 +0200 Subject: [PATCH 1/4] add qt5::x11extras module --- recipes/qt/5.x.x/conanfile.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index 04c3d8cf4bd53..b9bc4191f5585 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -209,6 +209,8 @@ def configure(self): if tools.os_info.is_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.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 From 3959e9f7f9df64fd65d06250b1ff640db87bf66b Mon Sep 17 00:00:00 2001 From: "andrei.malashkin" Date: Wed, 23 Jun 2021 07:01:04 +0200 Subject: [PATCH 2/4] use get_safe for qtx11extras flag --- recipes/qt/5.x.x/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index b9bc4191f5585..f064ef8c8e50b 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -1012,7 +1012,7 @@ def _create_plugin(pluginname, libname, type, requires): if self.options.qtnetworkauth: _create_module("NetworkAuth", ["Network"]) - if self.options.qtx11extras: + if self.options.get_safe(qtx11extras): _create_module("X11Extras") if not self.options.shared: From 262a27d6d6e919ddef48048b39dc31bcf51960b3 Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Wed, 23 Jun 2021 15:01:22 +0200 Subject: [PATCH 3/4] Update recipes/qt/5.x.x/conanfile.py Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com> --- recipes/qt/5.x.x/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index f064ef8c8e50b..425b297a90389 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -1012,7 +1012,7 @@ def _create_plugin(pluginname, libname, type, requires): if self.options.qtnetworkauth: _create_module("NetworkAuth", ["Network"]) - if self.options.get_safe(qtx11extras): + if self.options.get_safe("qtx11extras"): _create_module("X11Extras") if not self.options.shared: From 407beb5fb7d5b63981672d74b4ddf81371ff2f27 Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Thu, 24 Jun 2021 23:22:42 +0200 Subject: [PATCH 4/4] Update recipes/qt/5.x.x/conanfile.py Co-authored-by: Anonymous Maarten --- recipes/qt/5.x.x/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index 425b297a90389..45d4273c9d1fe 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -206,7 +206,7 @@ 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: