summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-09-28 12:53:44 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-09-28 13:00:58 (GMT)
commitfa5c83003db5dea46fc045b2fd90e6308a0d8911 (patch)
treeefeea5388b3699b67531fa3779f4f8e79f168142 /mkspecs
parent434e40dbb2726f1a3204b4ea3fcee7c531467e42 (diff)
downloadQt-fa5c83003db5dea46fc045b2fd90e6308a0d8911.zip
Qt-fa5c83003db5dea46fc045b2fd90e6308a0d8911.tar.gz
Qt-fa5c83003db5dea46fc045b2fd90e6308a0d8911.tar.bz2
fix moc argument quoting on mingw
for some bizarre reason, mingw doesn't like double quotes. so instead of building some more elaborate custom quoting, just let qmake do it for us. Reviewed-by: mariusSO
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/moc.prf10
1 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 15e7fd9..89e9b40 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -39,22 +39,22 @@ win32:count($$list($$INCLUDEPATH), 40, >) {
}
}
-defineReplace(mocCmd) {
+defineReplace(mocCmdBase) {
!isEmpty(WIN_INCLUDETEMP) {
RET =
if(contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc")) {
RET += $$mocinclude.commands
}
- RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) \"$$1\" -o $$2
+ RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D)
return($$RET)
}
- return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) \"$$1\" -o $$2)
+ return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D))
}
#moc headers
moc_header.CONFIG = moc_verify
moc_header.dependency_type = TYPE_C
-moc_header.commands = ${QMAKE_FUNC_mocCmd}
+moc_header.commands = ${QMAKE_FUNC_mocCmdBase} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
moc_header.output = $$MOC_DIR/$${QMAKE_H_MOD_MOC}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_CPP)}
moc_header.input = HEADERS
moc_header.variable_out = SOURCES
@@ -69,7 +69,7 @@ INCREDIBUILD_XGE += moc_header
#moc sources
moc_source.CONFIG = no_link moc_verify
moc_source.dependency_type = TYPE_C
-moc_source.commands = ${QMAKE_FUNC_mocCmd}
+moc_source.commands = ${QMAKE_FUNC_mocCmdBase} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
moc_source.output = $$MOC_DIR/$${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_EXT_CPP_MOC}
moc_source.input = SOURCES OBJECTIVE_SOURCES
moc_source.name = MOC ${QMAKE_FILE_IN}