From 945252a3bb43300e0486ab9fff62bc6e00fac8a8 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sat, 23 Apr 2022 23:32:58 -0400 Subject: qt module: fix broken install_dir kwarg Regression in commit 11f96380351a88059ec55f1070fdebc1b1033117. 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. --- mesonbuild/modules/qt.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mesonbuild') diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index fae4d97..6fbe0a2 100644 --- a/mesonbuild/modules/qt.py +++ b/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): FeatureNew.single_use('qt.compile_translations: custom_target or generator for "ts_files" keyword argument', '0.60.0', state.subproject, location=state.current_node) - install_dir = kwargs['install_dir'] qresource = kwargs['qresource'] if qresource: if ts_files: @@ -593,7 +592,7 @@ class QtBaseModule(ExtensionModule): [ts], ['@BASENAME@.qm'], install=kwargs['install'], - install_dir=install_dir, + install_dir=[kwargs['install_dir']], install_tag=['i18n'], build_by_default=kwargs['build_by_default'], ) -- cgit v1.1