diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-12-18 11:10:43 -0800 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-12-19 23:15:10 +0200 |
| commit | c1e416ff619e59845c5272475f2e7c1f48f1d8db (patch) | |
| tree | e474caff941e8fa00dbe58ce2b937eb66976882d /mesonbuild/dependencies/ui.py | |
| parent | d3e638fcbddce4a13d75a25101766f40d8a82b9f (diff) | |
| download | meson-c1e416ff619e59845c5272475f2e7c1f48f1d8db.zip meson-c1e416ff619e59845c5272475f2e7c1f48f1d8db.tar.gz meson-c1e416ff619e59845c5272475f2e7c1f48f1d8db.tar.bz2 | |
dependencies/ui: Fix qmake detection when not using cross or native file
Fixes #4641
Diffstat (limited to 'mesonbuild/dependencies/ui.py')
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 326c72e..7b3d051 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -14,7 +14,6 @@ # This file contains the detection logic for external dependencies that # are UI-related. - import functools import os import re @@ -342,10 +341,9 @@ class QtBaseDependency(ExternalDependency): return ExternalProgram.from_bin_list(self.env.cross_info.config['binaries'], 'qmake') elif self.env.config_info: # Prefer suffixed to unsuffixed version - p = ExternalProgram.from_bin_list(self.env.config_info.binaries, 'qmake-' + self.name) + p = ExternalProgram.from_bin_list(self.env.config_info.binaries, 'qmake') if p.found(): return p - return ExternalProgram.from_bin_list(self.env.config_info.binaries, 'qmake') return ExternalProgram(qmake, silent=True) def _qmake_detect(self, mods, kwargs): |