mirror of https://gitlab.com/ita1024/waf.git
Do not detect Qt6 when detecting Qt5
This commit is contained in:
parent
54464f0a20
commit
a296b4119e
|
@ -566,7 +566,7 @@ def find_qt5_binaries(self):
|
|||
# at the end, try to find qmake in the paths given
|
||||
# keep the one with the highest version
|
||||
cand = None
|
||||
prev_ver = ['5', '0', '0']
|
||||
prev_ver = ['0', '0', '0']
|
||||
for qmk in ('qmake-qt5', 'qmake5', 'qmake'):
|
||||
try:
|
||||
qmake = self.find_program(qmk, path_list=paths)
|
||||
|
@ -580,7 +580,7 @@ def find_qt5_binaries(self):
|
|||
else:
|
||||
if version:
|
||||
new_ver = version.split('.')
|
||||
if new_ver > prev_ver:
|
||||
if new_ver[0] == '5' and new_ver > prev_ver:
|
||||
cand = qmake
|
||||
prev_ver = new_ver
|
||||
|
||||
|
@ -783,7 +783,7 @@ def set_qt5_libs_to_check(self):
|
|||
pat = self.env.cxxstlib_PATTERN
|
||||
if Utils.unversioned_sys_platform() == 'darwin':
|
||||
pat = r"%s\.framework"
|
||||
re_qt = re.compile(pat%'Qt5?(?P<name>.*)'+'$')
|
||||
re_qt = re.compile(pat % 'Qt5?(?P<name>\\D+)' + '$')
|
||||
for x in dirlst:
|
||||
m = re_qt.match(x)
|
||||
if m:
|
||||
|
|
Loading…
Reference in New Issue