diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2021-06-01 11:25:39 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2021-06-15 12:35:15 -0700 |
commit | 4575ed3d31afc58bb286d260dee9d8dceb5fb3b3 (patch) | |
tree | e2eaab407ea1f07e12e79117def9aa074948e044 /mesonbuild/modules/qt.py | |
parent | f559e56d0a339659753d3b60957da6976d8bafd4 (diff) | |
download | meson-4575ed3d31afc58bb286d260dee9d8dceb5fb3b3.zip meson-4575ed3d31afc58bb286d260dee9d8dceb5fb3b3.tar.gz meson-4575ed3d31afc58bb286d260dee9d8dceb5fb3b3.tar.bz2 |
modules/qt: Deprecated the preprocess sources keyword argument
Diffstat (limited to 'mesonbuild/modules/qt.py')
-rw-r--r-- | mesonbuild/modules/qt.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index d14bfd2..c41ec9d 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 FeatureDeprecated, noPosargs, permittedKwargs, FeatureNew, FeatureNewKwargs +from ..interpreterbase import FeatureDeprecated, FeatureDeprecatedKwargs, noPosargs, permittedKwargs, FeatureNew, FeatureNewKwargs from ..interpreter import extract_required_kwarg from ..programs import NonExistingExternalProgram @@ -190,13 +190,14 @@ class QtBaseModule(ExtensionModule): @FeatureNewKwargs('qt.preprocess', '0.49.0', ['uic_extra_arguments']) @FeatureNewKwargs('qt.preprocess', '0.44.0', ['moc_extra_arguments']) @FeatureNewKwargs('qt.preprocess', '0.49.0', ['rcc_extra_arguments']) + @FeatureDeprecatedKwargs('qt.preprocess', '0.59.0', ['sources']) @permittedKwargs({'moc_headers', 'moc_sources', 'uic_extra_arguments', 'moc_extra_arguments', 'rcc_extra_arguments', 'include_directories', 'dependencies', 'ui_files', 'qresources', 'method'}) 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:] if _sources: - FeatureDeprecated.single_use('qt.preprocess positional sources', '0.59', state.subproject, 'use the "sources" keyword argument instead') + FeatureDeprecated.single_use('qt.preprocess positional sources', '0.59', state.subproject) sources.extend(_sources) method = kwargs.get('method', 'auto') self._detect_tools(state, method) |