diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2021-09-10 01:51:37 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2021-09-10 17:57:28 -0400 |
| commit | d2bf77342eb1b7bcd77148c79581fe2b85889ddd (patch) | |
| tree | facf678ee819fe05beb47dc885a98459cfeccc96 /mesonbuild/modules/qt.py | |
| parent | 7171d22f5f0a55deeaf27d8d8289c58962c3d680 (diff) | |
| download | meson-d2bf77342eb1b7bcd77148c79581fe2b85889ddd.zip meson-d2bf77342eb1b7bcd77148c79581fe2b85889ddd.tar.gz meson-d2bf77342eb1b7bcd77148c79581fe2b85889ddd.tar.bz2 | |
qt module: fix regression in building translations via qresource
In commit 3c4c7d042932c23a8ea24d85f24cd290d0a5ea13 the qresource
variable stopped being overwritten with a mesonlib.File, which is
reasonable. However, one call site for it which relied on being a built
file did not get renamed when needed.
Make the build target use the built file.
Diffstat (limited to 'mesonbuild/modules/qt.py')
| -rw-r--r-- | mesonbuild/modules/qt.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index 04263e0..4557183 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -539,7 +539,7 @@ class QtBaseModule(ExtensionModule): ts_files.append(c.rstrip('.qm') + '.ts') else: raise MesonException(f'qt.compile_translations: qresource can only contain qm files, found {c}') - results = self.preprocess(state, [], {'qresources': qresource, 'rcc_extra_arguments': kwargs['rcc_extra_arguments']}) + results = self.preprocess(state, [], {'qresources': qresource_file, 'rcc_extra_arguments': kwargs['rcc_extra_arguments']}) self._detect_tools(state, kwargs['method']) translations: T.List[build.CustomTarget] = [] for ts in ts_files: |