From 02def38741d5bf9701b463a77accce37e679cc9e Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 26 Feb 2018 18:12:41 +0000 Subject: [PATCH] Fix QtBaseDependency._framework_detect At the moment, QtBaseDependency._framework_detect sets is_found if at least one module is found. This gives the incorrect result in the case where both found and not-found modules are given. Fix it so it only sets is_found if all the modules given are found. --- mesonbuild/dependencies/ui.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index bc3eafc65..8960d501e 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -325,9 +325,12 @@ class QtBaseDependency(ExternalDependency): self.language, kwargs) self.compile_args.append('-F' + libdir) if fwdep.found(): - self.is_found = True self.compile_args += fwdep.get_compile_args() self.link_args += fwdep.get_link_args() + else: + break + else: + self.is_found = True # Used by self.compilers_detect() self.bindir = self.get_qmake_host_bins(qvars)