From 10194aafd10824fe1919aa44083224e8bea442ca Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@trolltech.com>
Date: Fri, 17 Apr 2009 15:41:09 +0200
Subject: fix compilation of QtWebKit with Visual Studio

Commits 6e5774d84e7e3b68736f95fae09a084bd5b9ac7a and
014af3e99616f9ee13ca365566828f7daf77a7f6 broke the Qt build for Visual
Studio / IncrediBuild. The problem is as follows: QtWebKit has too many
entries in INCLUDE_PATHS. In moc.prf is a rule that builds a
mocinclude.tmp that contains command line options for moc.
moc gets then called with @mocinclude.tmp.
Above commits create an QMAKE_EXTRA_TARGET for the mocinclude.tmp,
which is necessary for parallel MinGW builds.
Alas, qmake -tp vc doesn't support QMAKE_EXTRA_TARGET.
See task 189914. Once this task is solved, this commit must be reverted.

Reviewed-by: joao
---
 mkspecs/features/moc.prf | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 7c4ff28..60508c8 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -47,7 +47,12 @@ win32:count($$list($$INCPATH), 40, >) {
 
 defineReplace(mocCmd) {
     !isEmpty(WIN_INCLUDETEMP) {
-        return($$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2)
+        RET =
+        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
+        return($$RET)
     }
     return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2)
 }
-- 
cgit v0.12