summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2012-01-06 16:40:27 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-08 18:21:00 +0100
commitece75a8adfc30c91f25d45d37f98bf8cda90fdce (patch)
tree1eb1ad8871c11211cfecc21b3f7332f10297b5e7
parentc85121989f168d12e104a405e8afe3c89685ac25 (diff)
qmake: fix default value for C++ optimization in vcxproj files
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>
-rw-r--r--qmake/generators/win32/msbuild_objectmodel.cpp6
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp4
2 files changed, 8 insertions, 2 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index b20f2f951d..de95ad10be 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -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();
}
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index a5f0c6a616..fc69881de9 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -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 ;