aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules/qt.py
diff options
context:
space:
mode:
authorMarkus Theil <markus.theil@tu-ilmenau.de>2017-11-03 18:42:35 +0100
committerMarkus Theil <markus.theil@tu-ilmenau.de>2017-11-03 18:42:35 +0100
commitb36475ff44547d49f351ab87e6e024c48b368bbf (patch)
treee2082657396d83a8fafc02b0ac8c57f605c825ce /mesonbuild/modules/qt.py
parent51bc364a103a32f4474f77a0936d985a70292651 (diff)
downloadmeson-b36475ff44547d49f351ab87e6e024c48b368bbf.zip
meson-b36475ff44547d49f351ab87e6e024c48b368bbf.tar.gz
meson-b36475ff44547d49f351ab87e6e024c48b368bbf.tar.bz2
Qt-Module: fix rcc `name` with Qt4
Qt5's rcc knows --name and -name, Qt4's only -name. Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de>
Diffstat (limited to 'mesonbuild/modules/qt.py')
-rw-r--r--mesonbuild/modules/qt.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py
index f873b18..52dc978 100644
--- a/mesonbuild/modules/qt.py
+++ b/mesonbuild/modules/qt.py
@@ -108,7 +108,7 @@ class QtBaseModule:
name = 'qt' + str(self.qt_version) + '-' + basename.replace('.', '_')
rcc_kwargs = {'input': rcc_files,
'output': name + '.cpp',
- 'command': [self.rcc, '--name', '@BASENAME@', '-o', '@OUTPUT@', '@INPUT@'],
+ 'command': [self.rcc, '-name', '@BASENAME@', '-o', '@OUTPUT@', '@INPUT@'],
'depend_files': qrc_deps}
res_target = build.CustomTarget(name, state.subdir, state.subproject, rcc_kwargs)
sources.append(res_target)