Skip to content

Commit 03d13c9

Browse files
(#14218) (#14217) qwt: Fix unresolvable conflict
1 parent b4ab46b commit 03d13c9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

recipes/qwt/all/conanfile.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class QwtConan(ConanFile):
4747
}
4848

4949
tool_requires = (
50-
"cmake/3.23.2",
51-
"ninja/1.11.0"
50+
"cmake/3.24.2",
51+
"ninja/1.11.1"
5252
)
5353

5454
def _patch_sources(self):
@@ -60,12 +60,12 @@ def export_sources(self):
6060

6161

6262
def requirements(self):
63-
self.requires("qt/5.15.5")
63+
self.requires("qt/5.15.7")
6464

6565
def build_requirements(self):
6666
if self.settings.os == "Windows" and self.settings.compiler == "Visual Studio":
6767
self.build_requires("jom/1.1.3")
68-
self.tool_requires("qt/5.15.5")
68+
self.tool_requires("qt/5.15.7")
6969

7070
def validate(self):
7171
if hasattr(self, "settings_build") and cross_building(self, skip_x64_x86=True):

0 commit comments

Comments
 (0)