aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorLeif Middelschulte <leif.middelschulte@gmail.com>2017-10-26 13:02:29 +0200
committerLeif Middelschulte <leif.middelschulte@gmail.com>2017-10-26 13:06:58 +0200
commitb919e0582178fc39b56efbbf0dc66eb949badc0c (patch)
tree274cacda8f94a1cf86f668798b5f0b71d63e8be7 /mesonbuild
parent32a8ab40c151b48987fcf9ec7c11c13e5c53f509 (diff)
downloadmeson-b919e0582178fc39b56efbbf0dc66eb949badc0c.zip
meson-b919e0582178fc39b56efbbf0dc66eb949badc0c.tar.gz
meson-b919e0582178fc39b56efbbf0dc66eb949badc0c.tar.bz2
removes unnecessary code as suggested by @jeandet
Details: https://github.com/mesonbuild/meson/pull/2529#discussion_r146985692
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/modules/qt.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py
index c55d50f..a7b58db 100644
--- a/mesonbuild/modules/qt.py
+++ b/mesonbuild/modules/qt.py
@@ -129,11 +129,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:
- if len(moc_extra_arguments) > 0:
- concatinated_moc_extra_arguments = ' '.join(moc_extra_arguments)
- arguments = [concatinated_moc_extra_arguments, '@INPUT@', '-o', '@OUTPUT@']
- else:
- arguments = ['@INPUT@', '-o', '@OUTPUT@']
+ arguments = [moc_extra_arguments, '@INPUT@', '-o', '@OUTPUT@']
moc_kwargs = {'output': '@BASENAME@.moc',
'arguments': arguments}
moc_gen = build.Generator([self.moc], moc_kwargs)