From 9f675cc55a04545886e6de4fb1721acc6536f40c Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 19 Nov 2018 13:32:48 -0800 Subject: [PATCH] dependencies/ui: Fix qt compiler detection when bindir is set Fixes: #4527 --- mesonbuild/dependencies/ui.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index b58988991..e8fba91a2 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -240,6 +240,8 @@ class QtBaseDependency(ExternalDependency): def gen_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 b, b, self.required @@ -253,7 +255,7 @@ class QtBaseDependency(ExternalDependency): if not p.found(): continue - if b.startswith('lrelease'): + if name == 'lrelease': arg = ['-version'] elif mesonlib.version_compare(self.version, '>= 5'): arg = ['--version']