AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qmake: fix /MP option for VS 2010

Browse Source 
Setting QMAKE_CFLAGS+=/MP in a project file did not work for VS 2010.

Task-number: QTBUG-23490

Change-Id: I39c349bf8dc2a4add2f32a430a245a20cc54147e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Joerg Bornemann 2012-01-06 15:30:43 +01:00 committed by Qt by Nokia
parent 0ba89ed91f
commit c85121989f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qmake/generators/win32/msvc_objectmodel.cpp
View File

@ -649,11 +649,11 @@ bool VCCLCompilerTool::parseOption(const char* option)
RuntimeLibrary = rtMultiThreadedDebug; RuntimeLibrary = rtMultiThreadedDebug;
break; break;
} else if (second == 'P') { } else if (second == 'P') {
if (config->CompilerVersion >= NET2005) { if (config->CompilerVersion >= NET2010) {
AdditionalOptions += option;
} else if (config->CompilerVersion >= NET2010) {
MultiProcessorCompilation = _True; MultiProcessorCompilation = _True;
MultiProcessorCompilationProcessorCount = option+3; MultiProcessorCompilationProcessorCount = option+3;
} else if (config->CompilerVersion >= NET2005) {
AdditionalOptions += option;
} else { } else {
warn_msg(WarnLogic, "/MP option is not supported in Visual C++ < 2005, ignoring."); warn_msg(WarnLogic, "/MP option is not supported in Visual C++ < 2005, ignoring.");
} }