diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-04-01 16:22:35 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-04-01 16:22:35 +0300 |
commit | eea5b961fdcb4ad95d13264943332cc1fea5d30c (patch) | |
tree | 216fa71e0202fbf21f8d2eab764f78774f877f56 /dependencies.py | |
parent | 3d4aad9e0d0038061960469d4d380b7e57d53144 (diff) | |
download | meson-eea5b961fdcb4ad95d13264943332cc1fea5d30c.zip meson-eea5b961fdcb4ad95d13264943332cc1fea5d30c.tar.gz meson-eea5b961fdcb4ad95d13264943332cc1fea5d30c.tar.bz2 |
Qt5 test case and some implementation.
Diffstat (limited to 'dependencies.py')
-rw-r--r-- | dependencies.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/dependencies.py b/dependencies.py index 554eac4..8a66e24 100644 --- a/dependencies.py +++ b/dependencies.py @@ -288,8 +288,11 @@ class Qt5Dependency(): def __init__(self, kwargs): self.root = '/usr' self.modules = [] - for module in kwargs.get('modules', []): - self.modules.append(PkgConfigDependency('Qt5' + module)) + mods = kwargs.get('modules', []) + if isinstance(mods, str): + mods = [mods] + for module in mods: + self.modules.append(PkgConfigDependency('Qt5' + module, False)) if len(self.modules) == 0: raise DependencyException('No Qt5 modules specified.') self.moc = ExternalProgram('moc') @@ -311,6 +314,7 @@ class Qt5Dependency(): flags = [] for module in self.modules: flags += module.get_link_flags() + return flags def found(self): if not self.moc.found(): |