diff options
| author | Corentin Noël <corentin@elementary.io> | 2017-10-03 20:26:16 +0200 |
|---|---|---|
| committer | Corentin Noël <corentin@elementary.io> | 2017-10-03 20:26:16 +0200 |
| commit | 1320a98a33e4e9f188e5daa143316b24d0dce819 (patch) | |
| tree | 82ea281b163115277e1c9524283b0d371b6c21ac /mesonbuild/modules/qt4.py | |
| parent | f13887b64a9d535682668960493158ae15bfbb2d (diff) | |
| parent | 0c3d58baba4a61558ed9b4905f26155a3e95cf6c (diff) | |
| download | meson-1320a98a33e4e9f188e5daa143316b24d0dce819.zip meson-1320a98a33e4e9f188e5daa143316b24d0dce819.tar.gz meson-1320a98a33e4e9f188e5daa143316b24d0dce819.tar.bz2 | |
Merge github.com:mesonbuild/meson into vala-target-dirs
Diffstat (limited to 'mesonbuild/modules/qt4.py')
| -rw-r--r-- | mesonbuild/modules/qt4.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py index a63aff8..4ab07b9 100644 --- a/mesonbuild/modules/qt4.py +++ b/mesonbuild/modules/qt4.py @@ -21,6 +21,7 @@ from . import ExtensionModule import xml.etree.ElementTree as ET from . import ModuleReturnValue from ..interpreterbase import permittedKwargs +from . import get_include_args class Qt4Module(ExtensionModule): tools_detected = False @@ -97,10 +98,10 @@ class Qt4Module(ExtensionModule): except Exception: return [] - @permittedKwargs({'moc_headers', 'moc_sources', 'ui_files', 'qresources', 'method'}) + @permittedKwargs({'moc_headers', 'moc_sources', 'include_directories', 'ui_files', 'qresources', 'method'}) def preprocess(self, state, args, kwargs): - rcc_files, ui_files, moc_headers, moc_sources, sources \ - = extract_as_list(kwargs, 'qresources', 'ui_files', 'moc_headers', 'moc_sources', 'sources', pop = True) + rcc_files, ui_files, moc_headers, moc_sources, sources, include_directories \ + = extract_as_list(kwargs, 'qresources', 'ui_files', 'moc_headers', 'moc_sources', 'sources', 'include_directories', pop = True) sources += args[1:] method = kwargs.get('method', 'auto') self._detect_tools(state.environment, method) @@ -133,9 +134,10 @@ class Qt4Module(ExtensionModule): ui_gen = build.Generator([self.uic], ui_kwargs) ui_output = ui_gen.process_files('Qt4 ui', ui_files, state) sources.append(ui_output) + inc = get_include_args(include_dirs=include_directories) if len(moc_headers) > 0: moc_kwargs = {'output': 'moc_@BASENAME@.cpp', - 'arguments': ['@INPUT@', '-o', '@OUTPUT@']} + 'arguments': inc + ['@INPUT@', '-o', '@OUTPUT@']} moc_gen = build.Generator([self.moc], moc_kwargs) moc_output = moc_gen.process_files('Qt4 moc header', moc_headers, state) sources.append(moc_output) |