diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-04-23 23:32:58 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2022-04-30 11:49:12 +0300 |
| commit | 945252a3bb43300e0486ab9fff62bc6e00fac8a8 (patch) | |
| tree | 90cdf7fae0f6bc45eba66e4d8fe86399fcdcecf2 /mesonbuild | |
| parent | 2eb730f3ac3fd1b14646671a12495d741cddba4d (diff) | |
| download | meson-945252a3bb43300e0486ab9fff62bc6e00fac8a8.zip meson-945252a3bb43300e0486ab9fff62bc6e00fac8a8.tar.gz meson-945252a3bb43300e0486ab9fff62bc6e00fac8a8.tar.bz2 | |
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.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/modules/qt.py | 3 |
1 files changed, 1 insertions, 2 deletions
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'], ) |