diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-12-16 16:59:27 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-12-16 16:59:27 (GMT) |
| commit | f763f0089e0acb114524a6276c2ed7ff823d1d05 (patch) | |
| tree | e1d825f0a5f5429b27d153861f91b33dc4e4a6fc /qmake | |
| parent | 2a2dec6666f8f38e9240784b423ce69b18e1064e (diff) | |
| parent | cbe70d58bc1667b2e09f78a5d4427e7d071a2354 (diff) | |
| download | Qt-f763f0089e0acb114524a6276c2ed7ff823d1d05.zip Qt-f763f0089e0acb114524a6276c2ed7ff823d1d05.tar.gz Qt-f763f0089e0acb114524a6276c2ed7ff823d1d05.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 4 | ||||
| -rw-r--r-- | 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, |