From 342dd15d61b56f97714a5d483454397e2c978c97 Mon Sep 17 00:00:00 2001
From: Andy Shaw <qt-info@nokia.com>
Date: Mon, 6 Sep 2010 10:26:03 +0200
Subject: Fix compilation of qmake with MSVC

Reviewed-by: TrustMe
---
 qmake/Makefile.win32 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 4565c22..354a73f 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -23,13 +23,14 @@ LINK	    = link
 # specific stuff for VS2005
 #
 !if "$(QMAKESPEC)" == "win32-msvc2005"
-CFLAGS      = /Zc:wchar_t-
+CFLAGS_EXTRA      = /Zc:wchar_t-
 !elseif "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010"
-CFLAGS      = /MP
+CFLAGS_EXTRA      = /MP
 !endif
 
 CFLAGS_BARE = -c -Fo./ \
               -W3 -nologo -O2 \
+              $(CFLAGS_EXTRA) \
               -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian \
               -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
               -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \
-- 
cgit v0.12