diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-09-18 10:28:14 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-11-14 15:57:37 -0800 |
| commit | 95403cb61520978c52b3693a9bf0119e8348c20b (patch) | |
| tree | aff931dbdd7241075d5f52c9a1bd24f5c05e63dd /mesonbuild/dependencies/ui.py | |
| parent | 5a9c9c70df17c8f1ba900933574586c46c3d096f (diff) | |
| download | meson-95403cb61520978c52b3693a9bf0119e8348c20b.zip meson-95403cb61520978c52b3693a9bf0119e8348c20b.tar.gz meson-95403cb61520978c52b3693a9bf0119e8348c20b.tar.bz2 | |
replace ExternalProgram.from_cross_info with from_bin_list
This more generic method will also be used to check a config file for
binary information.
Diffstat (limited to 'mesonbuild/dependencies/ui.py')
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index e3b371d..ae05673 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -303,7 +303,7 @@ class QtBaseDependency(ExternalDependency): # Even when cross-compiling, if a cross-info qmake is not specified, we # fallback to using the qmake in PATH because that's what we used to do if self.env.is_cross_build() and 'qmake' in self.env.cross_info.config['binaries']: - return ExternalProgram.from_cross_info(self.env.cross_info, 'qmake') + return ExternalProgram.from_bin_list(self.env.cross_info.config['binaries'], 'qmake') return ExternalProgram(qmake, silent=True) def _qmake_detect(self, mods, kwargs): |