Skip to content

Commit

Permalink
Revert accidental changes that were necessary to make Qt 5.15 build o…
Browse files Browse the repository at this point in the history
…n my machine.
  • Loading branch information
wdobbe committed Dec 4, 2023
1 parent b0594a0 commit d5016bb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions recipes/qt/5.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def validate_build(self):
# In any case, check its actual version for compatibility
from six import StringIO # Python 2 and 3 compatible
mybuf = StringIO()
cmd_v = f"\"{python_exe}\" --version 2>&1"
cmd_v = f"\"{python_exe}\" --version"
self.run(cmd_v, mybuf)
verstr = mybuf.getvalue().strip().split("Python ")[1]
if verstr.endswith("+"):
Expand Down Expand Up @@ -355,7 +355,7 @@ def requirements(self):
if self.options.with_doubleconversion and not self.options.multiconfiguration:
self.requires("double-conversion/3.3.0")
if self.options.get_safe("with_freetype", False) and not self.options.multiconfiguration:
self.requires("freetype/2.13.2", override=True)
self.requires("freetype/2.13.2")
if self.options.get_safe("with_fontconfig", False):
self.requires("fontconfig/2.14.2")
if self.options.get_safe("with_icu", False):
Expand All @@ -370,7 +370,7 @@ def requirements(self):
if self.options.get_safe("with_libpng", False) and not self.options.multiconfiguration:
self.requires("libpng/1.6.40")
if self.options.with_sqlite3 and not self.options.multiconfiguration:
self.requires("sqlite3/3.44.2", override=True)
self.requires("sqlite3/3.44.2")
if self.options.get_safe("with_mysql", False):
self.requires("libmysqlclient/8.1.0")
if self.options.with_pq:
Expand Down

0 comments on commit d5016bb

Please sign in to comment.