diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2021-09-10 01:51:37 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2021-09-25 12:11:57 +0530 |
| commit | de805f678a95aca2c3ced04d599b55ab721153ec (patch) | |
| tree | 75b0753f06e36b663532f5bcd3a25935464e6860 | |
| parent | 76550746e4b4c7634d36fc71549d025871d288a2 (diff) | |
| download | meson-de805f678a95aca2c3ced04d599b55ab721153ec.tar.gz | |
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.
| -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 86b796ae4..357632247 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -495,7 +495,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: |