diff options
| author | Matthew Waters <matthew@centricular.com> | 2018-06-07 00:15:47 +1000 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-06-10 23:55:21 +0300 |
| commit | 4edec259cac2535f3d2f73451f53e5ac3ddb2e11 (patch) | |
| tree | 9007ec92cd63e5d9459c210cda5734b3832b3f19 | |
| parent | 14716ea90c5b4c7b8309751196ede734739a8ee0 (diff) | |
| download | meson-4edec259cac2535f3d2f73451f53e5ac3ddb2e11.zip meson-4edec259cac2535f3d2f73451f53e5ac3ddb2e11.tar.gz meson-4edec259cac2535f3d2f73451f53e5ac3ddb2e11.tar.bz2 | |
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.
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index ceadde5..44fdcd5 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) |