qt module: fix broken install_dir kwarg

Regression in commit 11f9638035. We expect
exactly one string as an install_dir, but CustomTarget started expecting
it to be a list. So we need to pass it as such when forwarding
compile_translations() arguments to the CustomTarget initializer.
pull/10233/head
Eli Schwartz 3 years ago committed by Jussi Pakkanen
parent 2eb730f3ac
commit 945252a3bb
  1. 3
      mesonbuild/modules/qt.py

@ -546,7 +546,6 @@ class QtBaseModule(ExtensionModule):
if any(isinstance(s, (build.CustomTarget, build.CustomTargetIndex, build.GeneratedList)) for s in ts_files): if any(isinstance(s, (build.CustomTarget, build.CustomTargetIndex, build.GeneratedList)) for s in ts_files):
FeatureNew.single_use('qt.compile_translations: custom_target or generator for "ts_files" keyword argument', FeatureNew.single_use('qt.compile_translations: custom_target or generator for "ts_files" keyword argument',
'0.60.0', state.subproject, location=state.current_node) '0.60.0', state.subproject, location=state.current_node)
install_dir = kwargs['install_dir']
qresource = kwargs['qresource'] qresource = kwargs['qresource']
if qresource: if qresource:
if ts_files: if ts_files:
@ -593,7 +592,7 @@ class QtBaseModule(ExtensionModule):
[ts], [ts],
['@BASENAME@.qm'], ['@BASENAME@.qm'],
install=kwargs['install'], install=kwargs['install'],
install_dir=install_dir, install_dir=[kwargs['install_dir']],
install_tag=['i18n'], install_tag=['i18n'],
build_by_default=kwargs['build_by_default'], build_by_default=kwargs['build_by_default'],
) )

Loading…
Cancel
Save