diff options
| author | Lorn Potter <lopotter@ljp-linux-vm.localdomain> | 2010-06-17 04:11:33 (GMT) |
|---|---|---|
| committer | Lorn Potter <lopotter@ljp-linux-vm.localdomain> | 2010-06-17 04:11:33 (GMT) |
| commit | 8335adf60299b728c0bf7a346a5afd94a3d56712 (patch) | |
| tree | a8057969ac369ddffec9fa2b92e10cdf1fc319eb /qmake/generators/win32/msvc_objectmodel.cpp | |
| parent | 0948de26bca9a68a354b436895bdf9e2db9c4288 (diff) | |
| parent | 30c8d1e3dccc83499ac3d76284cfb2e8d860808a (diff) | |
| download | Qt-8335adf60299b728c0bf7a346a5afd94a3d56712.zip Qt-8335adf60299b728c0bf7a346a5afd94a3d56712.tar.gz Qt-8335adf60299b728c0bf7a346a5afd94a3d56712.tar.bz2 | |
Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 604aa8a..1e060a0 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -674,6 +674,12 @@ bool VCCLCompilerTool::parseOption(const char* option) if(third == 'd') RuntimeLibrary = rtMultiThreadedDebug; break; + } else if (second == 'P') { + if (config->CompilerVersion >= NET2005) + AdditionalOptions += option; + else + warn_msg(WarnLogic, "/MP option is not supported in Visual C++ < 2005, ignoring."); + break; } found = false; break; case 'O': |