diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-02-26 20:11:07 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-02-26 20:11:07 +0200 |
| commit | 75818950f84e6eb29790d7bdc47445b529143008 (patch) | |
| tree | d1c46f617861ada7b3d5fcd6445bb0089b95aabc /dependencies.py | |
| parent | e3c97bbc288c74d3c479e1ceff4977453310d051 (diff) | |
| download | meson-75818950f84e6eb29790d7bdc47445b529143008.zip meson-75818950f84e6eb29790d7bdc47445b529143008.tar.gz meson-75818950f84e6eb29790d7bdc47445b529143008.tar.bz2 | |
Fix Qt tool finding on Fedora as it seemed to have broken while I was not looking. Fixes #45.
Diffstat (limited to 'dependencies.py')
| -rw-r--r-- | dependencies.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dependencies.py b/dependencies.py index f83345d..1855916 100644 --- a/dependencies.py +++ b/dependencies.py @@ -223,6 +223,7 @@ class WxDependency(Dependency): class ExternalProgram(): def __init__(self, name, fullpath=None, silent=False, search_dir=None): self.name = name + self.fullpath = None if fullpath is not None: if not isinstance(fullpath, list): self.fullpath = [fullpath] @@ -559,13 +560,13 @@ class Qt5Dependency(Dependency): # The binaries have different names on different # distros. Joy. global qt5toolinfo_printed - self.moc = ExternalProgram('moc', ['moc'], silent=True) + self.moc = ExternalProgram('moc', silent=True) if not self.moc.found(): self.moc = ExternalProgram('moc-qt5', silent=True) - self.uic = ExternalProgram('uic', ['uic'], silent=True) + self.uic = ExternalProgram('uic', silent=True) if not self.uic.found(): self.uic = ExternalProgram('uic-qt5', silent=True) - self.rcc = ExternalProgram('rcc', ['rcc'], silent=True) + self.rcc = ExternalProgram('rcc', silent=True) if not self.rcc.found(): self.rcc = ExternalProgram('rcc-qt5', silent=True) |