qt module: fix regression in building translations via qresource

In commit 3c4c7d0429 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.
pull/9239/head
Eli Schwartz 3 years ago
parent 7171d22f5f
commit d2bf77342e
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
  1. 2
      mesonbuild/modules/qt.py

@ -539,7 +539,7 @@ class QtBaseModule(ExtensionModule):
ts_files.append(c.rstrip('.qm') + '.ts') ts_files.append(c.rstrip('.qm') + '.ts')
else: else:
raise MesonException(f'qt.compile_translations: qresource can only contain qm files, found {c}') 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']) self._detect_tools(state, kwargs['method'])
translations: T.List[build.CustomTarget] = [] translations: T.List[build.CustomTarget] = []
for ts in ts_files: for ts in ts_files:

Loading…
Cancel
Save