diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-01-06 14:30:43 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-01-06 14:53:44 (GMT) |
| commit | 784a2e22d9e35c763e81561a0f5e6affd6688924 (patch) | |
| tree | c16b4a523a094563e1cfeac6dff9390510934f12 | |
| parent | ae056b16d7492f25541385aa245a409c29bc898a (diff) | |
| download | Qt-784a2e22d9e35c763e81561a0f5e6affd6688924.zip Qt-784a2e22d9e35c763e81561a0f5e6affd6688924.tar.gz Qt-784a2e22d9e35c763e81561a0f5e6affd6688924.tar.bz2 | |
qmake: fix /MP option for VS 2010
Setting QMAKE_CFLAGS+=/MP in a project file did not work for VS 2010.
Task-number: QTBUG-23490
Reviewed-by: ossi
Change-Id: I39c349bf8dc2a4add2f32a430a245a20cc54147e
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 85a642b..d31ccaf 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -649,11 +649,11 @@ bool VCCLCompilerTool::parseOption(const char* option) RuntimeLibrary = rtMultiThreadedDebug; break; } else if (second == 'P') { - if (config->CompilerVersion >= NET2005) { - AdditionalOptions += option; - } else if (config->CompilerVersion >= NET2010) { + if (config->CompilerVersion >= NET2010) { MultiProcessorCompilation = _True; MultiProcessorCompilationProcessorCount = option+3; + } else if (config->CompilerVersion >= NET2005) { + AdditionalOptions += option; } else { warn_msg(WarnLogic, "/MP option is not supported in Visual C++ < 2005, ignoring."); } |