From 95403cb61520978c52b3693a9bf0119e8348c20b Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 18 Sep 2018 10:28:14 -0700 Subject: 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. --- mesonbuild/dependencies/ui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/dependencies/ui.py') 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): -- cgit v1.1