diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-06-01 20:48:35 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-06-15 12:48:53 -0700 |
| commit | d2c1ab40a0c94209d8e13886f3c7d697d30f2507 (patch) | |
| tree | b1d1d6600aaea3942e001036ad8504cc34f09ad1 /mesonbuild/modules/qt.py | |
| parent | 2ac9b323918e8c61c4707fbd79d45cf1c6eecfd0 (diff) | |
| download | meson-d2c1ab40a0c94209d8e13886f3c7d697d30f2507.zip meson-d2c1ab40a0c94209d8e13886f3c7d697d30f2507.tar.gz meson-d2c1ab40a0c94209d8e13886f3c7d697d30f2507.tar.bz2 | |
interpreter|build: Pass just the executable down to Generator
This requires that the interpreter has done the validation, which it now
does at all callsites. This simplifies the Generator initializer.
Diffstat (limited to 'mesonbuild/modules/qt.py')
| -rw-r--r-- | mesonbuild/modules/qt.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index 297ef09..76cc4db 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -348,7 +348,7 @@ class QtBaseModule(ExtensionModule): 'output': 'ui_@BASENAME@.h', 'arguments': kwargs['extra_args'] + ['-o', '@OUTPUT@', '@INPUT@']} # TODO: This generator isn't added to the generator list in the Interpreter - gen = build.Generator([self.uic], ui_kwargs) # type: ignore + gen = build.Generator(self.uic, ui_kwargs) # type: ignore out = gen.process_files(f'Qt{self.qt_version} ui', kwargs['sources'], state) return ModuleReturnValue(out, [out]) @@ -384,12 +384,12 @@ class QtBaseModule(ExtensionModule): if kwargs['headers']: moc_kwargs = {'output': 'moc_@BASENAME@.cpp', 'arguments': arguments} - moc_gen = build.Generator([self.moc], moc_kwargs) # type: ignore + moc_gen = build.Generator(self.moc, moc_kwargs) # type: ignore output.append(moc_gen.process_files(f'Qt{self.qt_version} moc header', kwargs['headers'], state)) if kwargs['sources']: moc_kwargs = {'output': '@BASENAME@.moc', 'arguments': arguments} - moc_gen = build.Generator([self.moc], moc_kwargs) # type: ignore + moc_gen = build.Generator(self.moc, moc_kwargs) # type: ignore output.append(moc_gen.process_files(f'Qt{self.qt_version} moc source', kwargs['sources'], state)) return ModuleReturnValue(output, [output]) |