diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-11-19 13:32:48 -0800 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-11-22 23:37:16 +0200 |
| commit | 9f675cc55a04545886e6de4fb1721acc6536f40c (patch) | |
| tree | 66eed4b072ec46192742ac0004bfced9da6b3cd2 /mesonbuild | |
| parent | e58f18612148efa356ec8b6b1f09038fae6853ae (diff) | |
| download | meson-9f675cc55a04545886e6de4fb1721acc6536f40c.zip meson-9f675cc55a04545886e6de4fb1721acc6536f40c.tar.gz meson-9f675cc55a04545886e6de4fb1721acc6536f40c.tar.bz2 | |
dependencies/ui: Fix qt compiler detection when bindir is set
Fixes: #4527
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index b589889..e8fba91 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'] |