From e1706eab16a4cd7f64665249717cc293d3a1ce93 Mon Sep 17 00:00:00 2001
From: Andy Shaw <qt-info@nokia.com>
Date: Wed, 16 Dec 2009 13:14:15 +0100
Subject: Fixes:    Ensure QMAKE_LFLAGS+=/MACHINE:X64 works for vcproj files

RevBy:    Marius SO
Details:  It worked fine for Makefiles since no checking is done of
          the flags. Now its fixed so it works for vcproj files
	  too making it easier for people to build 64bit targets in
	  Visual Studio.
---
 qmake/generators/win32/msvc_objectmodel.cpp | 4 +++-
 qmake/generators/win32/msvc_objectmodel.h   | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 7dc456e..593a075 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -1394,8 +1394,10 @@ bool VCLinkerTool::parseOption(const char* option)
         case 0x0005bb6: // X86
             TargetMachine = machineX86;
             break;
-        // so we put the others in AdditionalOptions...
         case 0x0005b94: // X64
+            TargetMachine = machineX64;
+            break;
+        // so we put the others in AdditionalOptions...
         case 0x0046063: // AM33
         case 0x000466d: // ARM
         case 0x0004795: // CEE
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index d178d30..f7fdf3a 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -298,7 +298,8 @@ enum linkProgressOption {
 };
 enum machineTypeOption {
     machineNotSet,
-    machineX86
+    machineX86,
+    machineX64 = 17
 };
 enum midlCharOption {
     midlCharUnsigned,
-- 
cgit v0.12