Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dependencies/ui: Fix qt compiler detection when bindir is set 

Fixes: #4527
This commit is contained in:
Dylan Baker 2018-11-19 13:32:48 -08:00 committed by Jussi Pakkanen
parent e58f186121
commit 9f675cc55a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mesonbuild/dependencies/ui.py
View File

@ -240,6 +240,8 @@ class QtBaseDependency(ExternalDependency):
def gen_bins(): def gen_bins():
for b in bins: for b in bins:
if self.bindir:
yield os.path.join(self.bindir, b), b, False
yield '{}-{}'.format(b, self.name), b, False yield '{}-{}'.format(b, self.name), b, False
yield b, b, self.required yield b, b, self.required
@ -253,7 +255,7 @@ class QtBaseDependency(ExternalDependency):
if not p.found(): if not p.found():
continue continue
if b.startswith('lrelease'): if name == 'lrelease':
arg = ['-version'] arg = ['-version']
elif mesonlib.version_compare(self.version, '>= 5'): elif mesonlib.version_compare(self.version, '>= 5'):
arg = ['--version'] arg = ['--version']