From 7171d22f5f0a55deeaf27d8d8289c58962c3d680 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Fri, 10 Sep 2021 01:39:04 -0400 Subject: [PATCH] qt module: correctly register a found tool and stop looking for it Regression in commit d7ac2f10655433989e5e17867b6c8ef428fd39e8 since self.{tool_name} is not how it used to be tracked, and the "found" dictionary is a legacy of the old location. --- mesonbuild/modules/qt.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index 3ee5bb2e4..04263e076 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -122,8 +122,6 @@ class QtBaseModule(ExtensionModule): # It is important that this list does not change order as the order of # the returned ExternalPrograms will change as well bins = ['moc', 'uic', 'rcc', 'lrelease'] - found = {b: NonExistingExternalProgram(name=f'{b}-qt{qt_dep.qtver}') - for b in bins} wanted = f'== {qt_dep.version}' def gen_bins() -> T.Generator[T.Tuple[str, str], None, None]: @@ -136,7 +134,7 @@ class QtBaseModule(ExtensionModule): yield b, b for b, name in gen_bins(): - if found[name].found(): + if getattr(self, name).found(): continue if name == 'lrelease':