From d3d971e0f52ebbf53a67a0ce15af29af7ec9c0cd Mon Sep 17 00:00:00 2001 From: Igor Karatayev Date: Thu, 16 Mar 2023 15:48:20 +0300 Subject: [PATCH 1/4] Added qscxmlc tool to qt recipe. --- recipes/qt/6.x.x/conanfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py index 9e368533d2047..03832ff25228c 100644 --- a/recipes/qt/6.x.x/conanfile.py +++ b/recipes/qt/6.x.x/conanfile.py @@ -855,6 +855,8 @@ def package(self): targets.extend(["qmlformat", "qml", "qmlprofiler", "qmlpreview", "qmltestrunner"]) if self.options.get_safe("qtremoteobjects"): targets.append("repc") + if self.options.get_safe("qtscxml"): + targets.append("qscxmlc") for target in targets: exe_path = None for path_ in ["bin/{0}{1}".format(target, extension), From 7c965fd145b51dccea1eb1491fcccad0d1c3d739 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Mon, 27 Mar 2023 14:40:57 -0700 Subject: [PATCH 2/4] chore: bump openssl --- recipes/qt/6.x.x/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py index 03832ff25228c..ce98a1481f900 100644 --- a/recipes/qt/6.x.x/conanfile.py +++ b/recipes/qt/6.x.x/conanfile.py @@ -362,7 +362,7 @@ def layout(self): def requirements(self): self.requires("zlib/1.2.13") if self.options.openssl: - self.requires("openssl/1.1.1s") + self.requires("openssl/1.1.1t") if self.options.with_pcre2: self.requires("pcre2/10.40") if self.options.get_safe("with_vulkan"): From d434ccdb31cd8c87f8788c68e863e91d4e2e49ef Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Fri, 31 Mar 2023 15:02:13 -0700 Subject: [PATCH 3/4] chore: bump cmake --- recipes/qt/6.x.x/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py index ce98a1481f900..db8ccdc0553ca 100644 --- a/recipes/qt/6.x.x/conanfile.py +++ b/recipes/qt/6.x.x/conanfile.py @@ -433,7 +433,7 @@ def requirements(self): self.requires("md4c/0.4.8") def build_requirements(self): - self.tool_requires("cmake/3.25.2") + self.tool_requires("cmake/3.25.3") self.tool_requires("ninja/1.11.1") if not self.conf.get("tools.gnu:pkg_config", check_type=str): self.tool_requires("pkgconf/1.9.3") From bcb8b60e51bbad7a1d992103c003b7f2450e90b2 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Mon, 3 Apr 2023 15:30:37 -0700 Subject: [PATCH 4/4] bump cmake in test package --- recipes/qt/6.x.x/test_package/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qt/6.x.x/test_package/conanfile.py b/recipes/qt/6.x.x/test_package/conanfile.py index fd00ecad1f71c..b483a94caaaf1 100644 --- a/recipes/qt/6.x.x/test_package/conanfile.py +++ b/recipes/qt/6.x.x/test_package/conanfile.py @@ -15,7 +15,7 @@ class TestPackageConan(ConanFile): generators = "qt", "cmake", "cmake_find_package_multi", "cmake_find_package", "pkg_config", "qmake" def build_requirements(self): - self.tool_requires("cmake/3.25.0") + self.tool_requires("cmake/3.25.3") if self._meson_supported(): self.tool_requires("meson/0.60.2")