diff options
| -rw-r--r-- | modules/qt4.py | 12 | ||||
| -rw-r--r-- | modules/qt5.py | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/modules/qt4.py b/modules/qt4.py index c10eb48..bcf42a3 100644 --- a/modules/qt4.py +++ b/modules/qt4.py @@ -23,15 +23,15 @@ class Qt4Module(): mlog.log('Detecting Qt tools.') # The binaries have different names on different # distros. Joy. - self.moc = dependencies.ExternalProgram('moc', silent=True) + self.moc = dependencies.ExternalProgram('moc-qt4', silent=True) if not self.moc.found(): - self.moc = dependencies.ExternalProgram('moc-qt4', silent=True) - self.uic = dependencies.ExternalProgram('uic', silent=True) + self.moc = dependencies.ExternalProgram('moc', silent=True) + self.uic = dependencies.ExternalProgram('uic-qt4', silent=True) if not self.uic.found(): - self.uic = dependencies.ExternalProgram('uic-qt4', silent=True) - self.rcc = dependencies.ExternalProgram('rcc', silent=True) + self.uic = dependencies.ExternalProgram('uic', silent=True) + self.rcc = dependencies.ExternalProgram('rcc-qt4', silent=True) if not self.rcc.found(): - self.rcc = dependencies.ExternalProgram('rcc-qt4', silent=True) + self.rcc = dependencies.ExternalProgram('rcc', 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? diff --git a/modules/qt5.py b/modules/qt5.py index be996fb..d941439 100644 --- a/modules/qt5.py +++ b/modules/qt5.py @@ -24,15 +24,15 @@ class Qt5Module(): mlog.log('Detecting Qt tools.') # The binaries have different names on different # distros. Joy. - self.moc = dependencies.ExternalProgram('moc', silent=True) + self.moc = dependencies.ExternalProgram('moc-qt5', silent=True) if not self.moc.found(): - self.moc = dependencies.ExternalProgram('moc-qt5', silent=True) - self.uic = dependencies.ExternalProgram('uic', silent=True) + self.moc = dependencies.ExternalProgram('moc', silent=True) + self.uic = dependencies.ExternalProgram('uic-qt5', silent=True) if not self.uic.found(): - self.uic = dependencies.ExternalProgram('uic-qt5', silent=True) - self.rcc = dependencies.ExternalProgram('rcc', silent=True) + self.uic = dependencies.ExternalProgram('uic', silent=True) + self.rcc = dependencies.ExternalProgram('rcc-qt5', silent=True) if not self.rcc.found(): - self.rcc = dependencies.ExternalProgram('rcc-qt5', silent=True) + self.rcc = dependencies.ExternalProgram('rcc', 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? |