diff options
| author | Alexis Jeandet <alexis.jeandet@member.fsf.org> | 2017-11-22 22:52:38 +0100 |
|---|---|---|
| committer | Alexis Jeandet <alexis.jeandet@member.fsf.org> | 2017-11-22 22:52:38 +0100 |
| commit | 5de5e7673f48bd1d11f68c3c1cb69041f27d8d22 (patch) | |
| tree | 7ef463bc507d0cb1dacf288f36fcbe77522123aa /mesonbuild/modules/qt.py | |
| parent | e51da1a34d3ac2ed23451e05c971720c20aaa064 (diff) | |
| download | meson-5de5e7673f48bd1d11f68c3c1cb69041f27d8d22.zip meson-5de5e7673f48bd1d11f68c3c1cb69041f27d8d22.tar.gz meson-5de5e7673f48bd1d11f68c3c1cb69041f27d8d22.tar.bz2 | |
[Qt module] Few minor fixes
- removed a typo in tools detection loop
- added include dir also when parsing cpp sources with moc, not only headers
Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Diffstat (limited to 'mesonbuild/modules/qt.py')
| -rw-r--r-- | mesonbuild/modules/qt.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index 285169b..df6a631 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -62,7 +62,7 @@ class QtBaseModule: raise MesonException('{name} preprocessor is not for Qt {version}. Output:\n{stdo}\n{stderr}'.format( name=compiler_name, version=self.qt_version, stdo=stdout, stderr=stderr)) mlog.log(' {}:'.format(compiler_name.lower()), mlog.green('YES'), '({path}, {version})'.format( - path=self.moc.get_path(), version=compiler_ver.split()[-1])) + path=compiler.get_path(), version=compiler_ver.split()[-1])) else: mlog.log(' {}:'.format(compiler_name.lower()), mlog.red('NO')) self.tools_detected = True @@ -137,7 +137,7 @@ class QtBaseModule: moc_output = moc_gen.process_files('Qt{} moc header'.format(self.qt_version), moc_headers, state) sources.append(moc_output) if len(moc_sources) > 0: - arguments = moc_extra_arguments + ['@INPUT@', '-o', '@OUTPUT@'] + arguments = moc_extra_arguments + inc + ['@INPUT@', '-o', '@OUTPUT@'] moc_kwargs = {'output': '@BASENAME@.moc', 'arguments': arguments} moc_gen = build.Generator([self.moc], moc_kwargs) |