diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-03-18 22:51:03 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-03-18 22:51:03 +0200 |
| commit | 35a321fba9f51d09e87e31eadd1302f074052330 (patch) | |
| tree | c615ff6b1fa1b0e69dfda823f0ae025dbbac4ef6 | |
| parent | 7f07bc72c536eb1f1a2b75d1d1f57d4f0044f903 (diff) | |
| download | meson-35a321fba9f51d09e87e31eadd1302f074052330.zip meson-35a321fba9f51d09e87e31eadd1302f074052330.tar.gz meson-35a321fba9f51d09e87e31eadd1302f074052330.tar.bz2 | |
Fix Qt5 detection on Fedora.
| -rw-r--r-- | dependencies.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/dependencies.py b/dependencies.py index f8f9d10..af81b5b 100644 --- a/dependencies.py +++ b/dependencies.py @@ -420,9 +420,18 @@ class Qt5Dependency(Dependency): self.find_exes() def find_exes(self): + # The binaries have different names on different + # distros. Joy. self.moc = ExternalProgram('moc', silent=True) + if not self.moc.found(): + self.moc = ExternalProgram('moc-qt5', silent=True) self.uic = ExternalProgram('uic', silent=True) + if not self.uic.found(): + self.uic = ExternalProgram('uic-qt5', silent=True) self.rcc = ExternalProgram('rcc', silent=True) + if not self.rcc.found(): + self.rcc = ExternalProgram('rcc-qt5', silent=True) + # Moc, uic and rcc write their version strings to stderr. # Moc and rcc return a non-zero result when doing so. # What kind of an idiot thought that was a good idea? |