diff options
Diffstat (limited to 'mkspecs/features/moc.prf')
| -rw-r--r-- | mkspecs/features/moc.prf | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index c6632428d4..282d215a60 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -38,15 +38,17 @@ win32:count(INCLUDEPATH, 40, >) { } defineReplace(mocCmdBase) { + RET = !isEmpty(WIN_INCLUDETEMP) { - RET = contains(TEMPLATE, "vc.*") { RET += $$mocinclude.commands } - RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$QMAKE_MOC_OPTIONS - return($$RET) + incvar = @$$WIN_INCLUDETEMP + } else { + incvar = $(INCPATH) } - return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$QMAKE_MOC_OPTIONS) + RET += $$QMAKE_MOC $(DEFINES) $$incvar $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$QMAKE_MOC_OPTIONS + return($$RET) } #moc headers |