diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-06-01 14:12:29 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-06-15 12:35:15 -0700 |
| commit | ec592a4ecae1db61b9748ec7d2388f738cdb4737 (patch) | |
| tree | 40c83cd3efb1b47f5e9c6f09ac46a7a6e4f73fe6 /mesonbuild/modules/qt.py | |
| parent | fcdb0f9879f134e1113c1a1c6bddb4fcac323d4c (diff) | |
| download | meson-ec592a4ecae1db61b9748ec7d2388f738cdb4737.zip meson-ec592a4ecae1db61b9748ec7d2388f738cdb4737.tar.gz meson-ec592a4ecae1db61b9748ec7d2388f738cdb4737.tar.bz2 | |
modules/qt: use the compile_ui method inside the preprocess method
for code deduplication
Diffstat (limited to 'mesonbuild/modules/qt.py')
| -rw-r--r-- | mesonbuild/modules/qt.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index e4d2f5f..f3e6f27 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -329,14 +329,8 @@ class QtBaseModule(ExtensionModule): sources.extend(self.compile_resources(state, tuple(), rcc_kwargs).return_value) if ui_files: - if not self.uic.found(): - raise MesonException(err_msg.format('UIC', f'uic-qt{self.qt_version}', self.qt_version)) - arguments = uic_extra_arguments + ['-o', '@OUTPUT@', '@INPUT@'] - ui_kwargs = {'output': 'ui_@BASENAME@.h', - 'arguments': arguments} - ui_gen = build.Generator([self.uic], ui_kwargs) - ui_output = ui_gen.process_files(f'Qt{self.qt_version} ui', ui_files, state) - sources.append(ui_output) + ui_kwargs: 'UICompilerKwArgs' = {'sources': ui_files, 'extra_args': uic_extra_arguments, 'method': method} + sources.extend(self.compile_ui(state, tuple(), ui_kwargs).return_value) inc = state.get_include_args(include_dirs=include_directories) compile_args = [] |