From a1b8eb3831b64ccad44dc82f484fc2790f8d88a4 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Sun, 1 Sep 2013 21:29:34 +0200 Subject: [PATCH] Issue 1352, changed the default name for qt resources --- waflib/Tools/qt4.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/waflib/Tools/qt4.py b/waflib/Tools/qt4.py index 6b1fe640..e9811b50 100644 --- a/waflib/Tools/qt4.py +++ b/waflib/Tools/qt4.py @@ -370,9 +370,12 @@ class rcc(Task.Task): Process *.qrc* files """ color = 'BLUE' - run_str = '${QT_RCC} -name ${SRC[0].name} ${SRC[0].abspath()} ${RCC_ST} -o ${TGT}' + run_str = '${QT_RCC} -name ${tsk.rcname()} ${SRC[0].abspath()} ${RCC_ST} -o ${TGT}' ext_out = ['.h'] + def rcname(self): + return os.path.splitext(self.inputs[0].name)[0] + def scan(self): """Parse the *.qrc* files""" node = self.inputs[0]