diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-06-01 11:03:21 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-06-15 12:35:15 -0700 |
| commit | 0fe3dc6571303458d361952059750bd8479a9a65 (patch) | |
| tree | 90e9acfc3bd85f24588c0b31f9e0c884260a8241 /mesonbuild/modules/qt.py | |
| parent | 10863057159c8850e90c7bd5fb05b9ae1ba81e3e (diff) | |
| download | meson-0fe3dc6571303458d361952059750bd8479a9a65.zip meson-0fe3dc6571303458d361952059750bd8479a9a65.tar.gz meson-0fe3dc6571303458d361952059750bd8479a9a65.tar.bz2 | |
modules/qt: Deprecated the *sources variadic argument to preproccess
It's confusing, and it's a duplicate of the `sources` keyword argument,
which has always existed.
Diffstat (limited to 'mesonbuild/modules/qt.py')
| -rw-r--r-- | mesonbuild/modules/qt.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index aecfe50..d14bfd2 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -24,7 +24,7 @@ from ..mesonlib import MesonException, extract_as_list, File, unholder, version_ from ..dependencies import Dependency import xml.etree.ElementTree as ET from . import ModuleReturnValue, ExtensionModule -from ..interpreterbase import noPosargs, permittedKwargs, FeatureNew, FeatureNewKwargs +from ..interpreterbase import FeatureDeprecated, noPosargs, permittedKwargs, FeatureNew, FeatureNewKwargs from ..interpreter import extract_required_kwarg from ..programs import NonExistingExternalProgram @@ -194,7 +194,10 @@ class QtBaseModule(ExtensionModule): def preprocess(self, state, args, kwargs): rcc_files, ui_files, moc_headers, moc_sources, uic_extra_arguments, moc_extra_arguments, rcc_extra_arguments, sources, include_directories, dependencies \ = [extract_as_list(kwargs, c, pop=True) for c in ['qresources', 'ui_files', 'moc_headers', 'moc_sources', 'uic_extra_arguments', 'moc_extra_arguments', 'rcc_extra_arguments', 'sources', 'include_directories', 'dependencies']] - sources += args[1:] + _sources = args[1:] + if _sources: + FeatureDeprecated.single_use('qt.preprocess positional sources', '0.59', state.subproject, 'use the "sources" keyword argument instead') + sources.extend(_sources) method = kwargs.get('method', 'auto') self._detect_tools(state, method) err_msg = "{0} sources specified and couldn't find {1}, " \ |