interpreter: fix cases of `KwargInfo(..., T, default=None)`

The correct way to mark these is `KwargInfo(..., (T, type(None)))`.
There's also a few cases of `(T, None)` which is invalid, as `None`
isn't a type

1 files changed, 3 insertions, 2 deletions

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=[]),
     )