aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules/qt.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-07-21 10:52:43 -0700
committerDylan Baker <dylan@pnwbakers.com>2021-08-18 19:46:47 -0700
commitff573620b0e64204158db543735eafd2b48cdbf6 (patch)
tree8cd5f9250b12c349fc09e36c23859efc8c50a252 /mesonbuild/modules/qt.py
parent965fcf2883a758b777a61671aa41d51b27bc1759 (diff)
downloadmeson-ff573620b0e64204158db543735eafd2b48cdbf6.zip
meson-ff573620b0e64204158db543735eafd2b48cdbf6.tar.gz
meson-ff573620b0e64204158db543735eafd2b48cdbf6.tar.bz2
modules/qt: allow passing generated targets to compile_ui
Diffstat (limited to 'mesonbuild/modules/qt.py')
-rw-r--r--mesonbuild/modules/qt.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py
index 653c6f2..3987af4 100644
--- a/mesonbuild/modules/qt.py
+++ b/mesonbuild/modules/qt.py
@@ -52,7 +52,7 @@ if T.TYPE_CHECKING:
"""Keyword arguments for the Ui Compiler method."""
- sources: T.Sequence[T.Union[FileOrString, build.CustomTarget]]
+ sources: T.Sequence[T.Union[FileOrString, build.CustomTarget, build.CustomTargetIndex, build.GeneratedList]]
extra_args: T.List[str]
method: str
@@ -337,12 +337,19 @@ class QtBaseModule(ExtensionModule):
@noPosargs
@typed_kwargs(
'qt.compile_ui',
- KwargInfo('sources', ContainerTypeInfo(list, (File, str), allow_empty=False), listify=True, required=True),
+ KwargInfo(
+ 'sources',
+ ContainerTypeInfo(list, (File, str, build.CustomTarget, build.CustomTargetIndex, build.GeneratedList), allow_empty=False),
+ listify=True,
+ required=True,
+ ),
KwargInfo('extra_args', ContainerTypeInfo(list, str), listify=True, default=[]),
KwargInfo('method', str, default='auto')
)
def compile_ui(self, state: 'ModuleState', args: T.Tuple, kwargs: 'UICompilerKwArgs') -> ModuleReturnValue:
"""Compile UI resources into cpp headers."""
+ if any(isinstance(s, (build.CustomTarget, build.CustomTargetIndex, build.GeneratedList)) for s in kwargs['sources']):
+ FeatureNew.single_use('qt.compile_ui: custom_target or generator for "sources" keyword argument', '0.60.0', state.subproject)
out = self._compile_ui_impl(state, kwargs)
return ModuleReturnValue(out, [out])