From 4edec259cac2535f3d2f73451f53e5ac3ddb2e11 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Thu, 7 Jun 2018 00:15:47 +1000 Subject: [PATCH] modules/qt: check for un-suffixed moc,rcc,uic on windows The windows Qt installer doesn't ship with suffixed versions of the qt tools. --- mesonbuild/dependencies/ui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index ceadde5a3..44fdcd517 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -238,7 +238,7 @@ class QtBaseDependency(ExternalDependency): def compilers_detect(self): "Detect Qt (4 or 5) moc, uic, rcc in the specified bindir or in PATH" - if self.bindir: + if self.bindir or for_windows(self.env.is_cross_build(), self.env): moc = ExternalProgram(os.path.join(self.bindir, 'moc'), silent=True) uic = ExternalProgram(os.path.join(self.bindir, 'uic'), silent=True) rcc = ExternalProgram(os.path.join(self.bindir, 'rcc'), silent=True)