diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-09-21 14:51:15 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-23 02:09:09 (GMT) |
| commit | c4d153c5a5adb78ae577a8c9484d661e39dc6125 (patch) | |
| tree | a7889696ce2c6f00803964891e1f1b2fd35d3180 | |
| parent | c025fda36e767a74cd50df9521819dbdbc1625d8 (diff) | |
| download | Qt-c4d153c5a5adb78ae577a8c9484d661e39dc6125.zip Qt-c4d153c5a5adb78ae577a8c9484d661e39dc6125.tar.gz Qt-c4d153c5a5adb78ae577a8c9484d661e39dc6125.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.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index abda78f..15e7fd9 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 |