diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-11-13 21:17:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-13 21:17:41 +0200 |
| commit | 897fd0bd169a5333b8b15af6b6e102ab53fe5cdf (patch) | |
| tree | 75741d961acab948ee9671e9d152e71f5f9c5f35 /mesonbuild/modules/qt.py | |
| parent | 69bd87a71624e2e665c3d43d765a3c5fb1313c96 (diff) | |
| parent | 875b3bbbe46bc9a04f95e305e22380dc8a60af39 (diff) | |
| download | meson-897fd0bd169a5333b8b15af6b6e102ab53fe5cdf.zip meson-897fd0bd169a5333b8b15af6b6e102ab53fe5cdf.tar.gz meson-897fd0bd169a5333b8b15af6b6e102ab53fe5cdf.tar.bz2 | |
Merge pull request #2579 from thillux/master
Qt5-Module: add `name` option to rcc
Diffstat (limited to 'mesonbuild/modules/qt.py')
| -rw-r--r-- | mesonbuild/modules/qt.py | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index 5800e5c..285169b 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -101,17 +101,25 @@ class QtBaseModule: qrc_deps = [] for i in rcc_files: qrc_deps += self.parse_qrc(state, i) + # custom output name set? -> one output file, multiple otherwise if len(args) > 0: name = args[0] + rcc_kwargs = {'input': rcc_files, + 'output': name + '.cpp', + 'command': [self.rcc, '-name', name, '-o', '@OUTPUT@', '@INPUT@'], + 'depend_files': qrc_deps} + res_target = build.CustomTarget(name, state.subdir, state.subproject, rcc_kwargs) + sources.append(res_target) else: - basename = os.path.split(rcc_files[0])[1] - name = 'qt' + str(self.qt_version) + '-' + basename.replace('.', '_') - rcc_kwargs = {'input': rcc_files, - 'output': name + '.cpp', - 'command': [self.rcc, '-o', '@OUTPUT@', '@INPUT@'], - 'depend_files': qrc_deps} - res_target = build.CustomTarget(name, state.subdir, state.subproject, rcc_kwargs) - sources.append(res_target) + for rcc_file in rcc_files: + basename = os.path.split(rcc_file)[1] + name = 'qt' + str(self.qt_version) + '-' + basename.replace('.', '_') + rcc_kwargs = {'input': rcc_file, + 'output': name + '.cpp', + 'command': [self.rcc, '-name', '@BASENAME@', '-o', '@OUTPUT@', '@INPUT@'], + 'depend_files': qrc_deps} + res_target = build.CustomTarget(name, state.subdir, state.subproject, rcc_kwargs) + sources.append(res_target) if len(ui_files) > 0: if not self.uic.found(): raise MesonException(err_msg.format('UIC', 'uic-qt' + self.qt_version)) |