From b965c300710f38f1a50b784c8fcf2db49f35f262 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Thu, 14 Mar 2013 19:09:05 +0100
Subject: de-duplicate code a bit

Change-Id: I35cd81e308c512bdec50de1f19ae9c708012afa0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 mkspecs/features/moc.prf | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'mkspecs/features/moc.prf')

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
-- 
cgit v1.2.3