diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-06-02 10:32:44 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-06-02 13:49:13 (GMT) |
| commit | 33213ad69d29dbe82395bf3865e4f80128edd6a6 (patch) | |
| tree | d77814bf51f5bd27c9f3eb89cf6b7f898fc6de24 /qmake | |
| parent | 49c4fc384ce7e762fa47c2645654d3e2a1778469 (diff) | |
| download | Qt-33213ad69d29dbe82395bf3865e4f80128edd6a6.zip Qt-33213ad69d29dbe82395bf3865e4f80128edd6a6.tar.gz Qt-33213ad69d29dbe82395bf3865e4f80128edd6a6.tar.bz2 | |
qmake: don't warn about unknown MSVC compiler option /MP
VCCLCompilerTool didn't know about the /MP option, which is available
since Visual C++ 2005.
Task-number: QTBUG-3252
Reviewed-by: ossi
Diffstat (limited to 'qmake')
| -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 5f3d433..ee7b228 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -673,6 +673,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': |