diff options
| author | Alexis Jeandet <alexis.jeandet@member.fsf.org> | 2017-08-29 22:21:11 +0200 |
|---|---|---|
| committer | Alexis Jeandet <alexis.jeandet@member.fsf.org> | 2017-09-18 22:21:22 +0200 |
| commit | bf64cf569b6ecf90db0f2bb181edb8f0ff0c9a3b (patch) | |
| tree | a8af035a5f74383528e1b28d8e16b6d545364347 /mesonbuild/modules/qt4.py | |
| parent | 55975f852e502137e3d78d6af204f1bc58a98551 (diff) | |
| download | meson-bf64cf569b6ecf90db0f2bb181edb8f0ff0c9a3b.zip meson-bf64cf569b6ecf90db0f2bb181edb8f0ff0c9a3b.tar.gz meson-bf64cf569b6ecf90db0f2bb181edb8f0ff0c9a3b.tar.bz2 | |
Gnome, pkgconfig, Qt4, Qt5 and windows modules slightly refactored.
Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Diffstat (limited to 'mesonbuild/modules/qt4.py')
| -rw-r--r-- | mesonbuild/modules/qt4.py | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py index 4056b6d..37e630b 100644 --- a/mesonbuild/modules/qt4.py +++ b/mesonbuild/modules/qt4.py @@ -15,7 +15,7 @@ import os from .. import mlog from .. import build -from ..mesonlib import MesonException, Popen_safe +from ..mesonlib import MesonException, Popen_safe, extract_as_list from ..dependencies import Qt4Dependency from . import ExtensionModule import xml.etree.ElementTree as ET @@ -99,21 +99,8 @@ class Qt4Module(ExtensionModule): @permittedKwargs({'moc_headers', 'moc_sources', 'ui_files', 'qresources', 'method'}) def preprocess(self, state, args, kwargs): - rcc_files = kwargs.pop('qresources', []) - if not isinstance(rcc_files, list): - rcc_files = [rcc_files] - ui_files = kwargs.pop('ui_files', []) - if not isinstance(ui_files, list): - ui_files = [ui_files] - moc_headers = kwargs.pop('moc_headers', []) - if not isinstance(moc_headers, list): - moc_headers = [moc_headers] - moc_sources = kwargs.pop('moc_sources', []) - if not isinstance(moc_sources, list): - moc_sources = [moc_sources] - sources = kwargs.pop('sources', []) - if not isinstance(sources, list): - sources = [sources] + rcc_files, ui_files, moc_headers, moc_sources, sources \ + = extract_as_list(kwargs, 'qresources', 'ui_files', 'moc_headers', 'moc_sources', 'sources', pop = True) sources += args[1:] method = kwargs.get('method', 'auto') self._detect_tools(state.environment, method) |