From b36475ff44547d49f351ab87e6e024c48b368bbf Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Fri, 3 Nov 2017 18:42:35 +0100 Subject: Qt-Module: fix rcc `name` with Qt4 Qt5's rcc knows --name and -name, Qt4's only -name. Signed-off-by: Markus Theil --- mesonbuild/modules/qt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/modules') 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) -- cgit v1.1