From 18c38df875ed99324c74dea2c6d9765f25c10ff8 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 20 Dec 2016 03:56:46 -0500 Subject: Add Generator.process_files to reduce code duplication. --- mesonbuild/modules/qt5.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'mesonbuild/modules/qt5.py') diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py index 35a475a..d4cd261 100644 --- a/mesonbuild/modules/qt5.py +++ b/mesonbuild/modules/qt5.py @@ -146,22 +146,19 @@ class Qt5Module(): ui_kwargs = {'output' : 'ui_@BASENAME@.h', 'arguments' : ['-o', '@OUTPUT@', '@INPUT@']} ui_gen = build.Generator([self.uic], ui_kwargs) - ui_output = build.GeneratedList(ui_gen) - [ui_output.add_file(os.path.join(state.subdir, a)) for a in ui_files] + ui_output = ui_gen.process_files('Qt5 ui', ui_files, state) sources.append(ui_output) if len(moc_headers) > 0: moc_kwargs = {'output' : 'moc_@BASENAME@.cpp', 'arguments' : ['@INPUT@', '-o', '@OUTPUT@']} moc_gen = build.Generator([self.moc], moc_kwargs) - moc_output = build.GeneratedList(moc_gen) - [moc_output.add_file(os.path.join(state.subdir, a)) for a in moc_headers] + moc_output = moc_gen.process_files('Qt5 moc header', moc_headers, state) sources.append(moc_output) if len(moc_sources) > 0: moc_kwargs = {'output' : '@BASENAME@.moc', 'arguments' : ['@INPUT@', '-o', '@OUTPUT@']} moc_gen = build.Generator([self.moc], moc_kwargs) - moc_output = build.GeneratedList(moc_gen) - [moc_output.add_file(os.path.join(state.subdir, a)) for a in moc_sources] + moc_output = moc_gen.process_files('Qt5 moc source', moc_sources, state) sources.append(moc_output) return sources -- cgit v1.1