1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: fix default value for C++ optimization in vcxproj files

Browse Source 
For the debug configuration the optimization should be turned off.

Task-number: QTBUG-23421

Change-Id: Ib63e0c51f9ab31180ff8ee01a1f6c57ab77e390e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Joerg Bornemann 2012-01-06 16:40:27 +01:00 committed by Qt by Nokia
parent c85121989f
commit ece75a8adf
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -925,15 +925,17 @@ static inline QString toString(inlineExpansionOption option)
static inline QString toString(optimizeOption option)
{
switch (option) {
case optimizeDisabled:
case optimizeFull:
case optimizeCustom:
case optimizeDefault:
break;
case optimizeDisabled:
return "Disabled";
case optimizeMinSpace:
return "MinSpace";
case optimizeMaxSpeed:
return "MaxSpeed";
case optimizeFull:
return "Full";
}
return QString();
}

4
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -949,6 +949,10 @@ void VcprojGenerator::initCompilerTool()
placement = ".\\";
VCConfiguration &conf = vcProject.Configuration;
if (conf.CompilerVersion >= NET2010) {
// adjust compiler tool defaults for VS 2010 and above
conf.compiler.Optimization = optimizeDisabled;
}
conf.compiler.AssemblerListingLocation = placement ;
conf.compiler.ProgramDataBaseFileName = ".\\" ;
conf.compiler.ObjectFile = placement ;