From c1e416ff619e59845c5272475f2e7c1f48f1d8db Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 18 Dec 2018 11:10:43 -0800 Subject: dependencies/ui: Fix qmake detection when not using cross or native file Fixes #4641 --- mesonbuild/dependencies/ui.py | 4 +--- 1 file changed, 1 insertion(+), 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): -- cgit v1.1