summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2010-09-21 14:51:15 (GMT)
committerSamuli Piippo <samuli.piippo@digia.com>2011-06-09 10:06:56 (GMT)
commit0a245d03022efbc1664b4f8844e4ff9a1c71b063 (patch)
tree9bf617969af511e17ecc1aabf9acf65bd894ba99
parentf65535029333b31cfa5bc72dd498aafbf95e1a96 (diff)
downloadQt-0a245d03022efbc1664b4f8844e4ff9a1c71b063.zip
Qt-0a245d03022efbc1664b4f8844e4ff9a1c71b063.tar.gz
Qt-0a245d03022efbc1664b4f8844e4ff9a1c71b063.tar.bz2
qmake: fix quoting of moc calls
Task-number: QTBUG-13782 Reviewed-by: ossi (cherry picked from commit 36fc9e830b828b69c4df775c68c07c25c9bab4cf)
-rw-r--r--mkspecs/features/moc.prf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index e1296ec..dd787db 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -45,10 +45,10 @@ defineReplace(mocCmd) {
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) \"$$1\" -o $$2
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) \"$$1\" -o $$2)
}
#moc headers