de-duplicate code a bit

Change-Id: I35cd81e308c512bdec50de1f19ae9c708012afa0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-03-14 19:09:05 +01:00 committed by The Qt Project
parent 72e81619d9
commit b965c30071

View File

@ -38,15 +38,17 @@ win32:count(INCLUDEPATH, 40, >) {
} }
defineReplace(mocCmdBase) { defineReplace(mocCmdBase) {
!isEmpty(WIN_INCLUDETEMP) {
RET = RET =
!isEmpty(WIN_INCLUDETEMP) {
contains(TEMPLATE, "vc.*") { contains(TEMPLATE, "vc.*") {
RET += $$mocinclude.commands RET += $$mocinclude.commands
} }
RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$QMAKE_MOC_OPTIONS incvar = @$$WIN_INCLUDETEMP
return($$RET) } 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 #moc headers