diff options
Diffstat (limited to 'mesonbuild/modules')
-rw-r--r-- | mesonbuild/modules/python.py | 3 | ||||
-rw-r--r-- | mesonbuild/modules/qt.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index bb6b9ab..d03f951 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -28,6 +28,7 @@ from ..dependencies import DependencyMethods, PkgConfigDependency, NotFoundDepen from ..dependencies.base import process_method_kw from ..environment import detect_cpu_family from ..interpreter import ExternalProgramHolder, extract_required_kwarg, permitted_dependency_kwargs +from ..interpreter.type_checking import NoneType from ..interpreterbase import ( noPosargs, noKwargs, permittedKwargs, ContainerTypeInfo, InvalidArguments, typed_pos_args, typed_kwargs, KwargInfo, @@ -484,7 +485,7 @@ class PythonInstallation(ExternalProgramHolder): @typed_pos_args('install_data', varargs=(str, mesonlib.File)) @typed_kwargs('python_installation.install_sources', _PURE_KW, _SUBDIR_KW, - KwargInfo('install_tag', str, since='0.60.0')) + KwargInfo('install_tag', (str, NoneType), since='0.60.0')) def install_sources_method(self, args: T.Tuple[T.List[T.Union[str, mesonlib.File]]], kwargs: 'PyInstallKw') -> 'Data': tag = kwargs['install_tag'] or 'runtime' diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index 9a1220f..3ee5bb2 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -26,6 +26,7 @@ from ..dependencies import find_external_dependency, Dependency, ExternalLibrary from ..mesonlib import MesonException, File, FileOrString, version_compare, Popen_safe from . import ModuleReturnValue, ExtensionModule from ..interpreter import extract_required_kwarg +from ..interpreter.type_checking import NoneType from ..interpreterbase import ContainerTypeInfo, FeatureDeprecated, KwargInfo, noPosargs, FeatureNew, typed_kwargs from ..programs import ExternalProgram, NonExistingExternalProgram @@ -510,9 +511,9 @@ class QtBaseModule(ExtensionModule): 'qt.compile_translations', KwargInfo('build_by_default', bool, default=False), KwargInfo('install', bool, default=False), - KwargInfo('install_dir', str), + KwargInfo('install_dir', (str, NoneType)), KwargInfo('method', str, default='auto'), - KwargInfo('qresource', str, since='0.56.0'), + KwargInfo('qresource', (str, NoneType), since='0.56.0'), KwargInfo('rcc_extra_arguments', ContainerTypeInfo(list, str), listify=True, default=[], since='0.56.0'), KwargInfo('ts_files', ContainerTypeInfo(list, (str, File, build.CustomTarget, build.CustomTargetIndex, build.GeneratedList)), listify=True, default=[]), ) |