From 751f03c55767d7d9f99f13253a653bb095e798a8 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Wed, 29 Oct 2014 00:57:09 +0200 Subject: Pass -qt5 command line argument to qt5 tools because otherwise they fail on Debian systems where qt5-default is not installed (e.g. pbuilder). --- dependencies.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dependencies.py b/dependencies.py index 448e6fe..77922d8 100644 --- a/dependencies.py +++ b/dependencies.py @@ -132,7 +132,10 @@ class ExternalProgram(): def __init__(self, name, fullpath=None, silent=False, search_dir=None): self.name = name if fullpath is not None: - self.fullpath = [fullpath] + if not isinstance(fullpath, list): + self.fullpath = [fullpath] + else: + self.fullpath = fullpath else: self.fullpath = [shutil.which(name)] if self.fullpath[0] is None and search_dir is not None: @@ -448,13 +451,13 @@ class Qt5Dependency(Dependency): # The binaries have different names on different # distros. Joy. global qt5toolinfo_printed - self.moc = ExternalProgram('moc', silent=True) + self.moc = ExternalProgram('moc', ['moc', '-qt5'], silent=True) if not self.moc.found(): self.moc = ExternalProgram('moc-qt5', silent=True) - self.uic = ExternalProgram('uic', silent=True) + self.uic = ExternalProgram('uic', ['uic', '-qt5'], silent=True) if not self.uic.found(): self.uic = ExternalProgram('uic-qt5', silent=True) - self.rcc = ExternalProgram('rcc', silent=True) + self.rcc = ExternalProgram('rcc', ['rcc', '-qt5'], silent=True) if not self.rcc.found(): self.rcc = ExternalProgram('rcc-qt5', silent=True) -- cgit v1.1