diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 00:05:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 00:05:09 (GMT) |
| commit | f26fbd5d93d904ffe46f82070b4114d9f27a9427 (patch) | |
| tree | 5598e0128500ed5091916c222c3bd330de3dac55 | |
| parent | 932b4b95cf4c7cc250b2c3f23d9b903292f84ab4 (diff) | |
| parent | 33213ad69d29dbe82395bf3865e4f80128edd6a6 (diff) | |
| download | Qt-f26fbd5d93d904ffe46f82070b4114d9f27a9427.zip Qt-f26fbd5d93d904ffe46f82070b4114d9f27a9427.tar.gz Qt-f26fbd5d93d904ffe46f82070b4114d9f27a9427.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qmake: don't warn about unknown MSVC compiler option /MP
| -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': |