From e98362e20a0ed4f4f889c9dc1bcf0f85653d36eb Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 22 Mar 2012 12:27:23 +0100 Subject: qmake: fix default value for C++ optimization in vcxproj files For the debug configuration the optimization should be turned off. This is the completion of the backport of ece75a8adfc30c91f25d45d37f98bf8cda90fdce. Task-number: QTBUG-23421 Change-Id: Ibf30d1e27b3b614bd4b1304d21be76af3faf0249 Reviewed-by: Andy Shaw Reviewed-by: Oswald Buddenhagen Reviewed-by: Joerg Bornemann --- qmake/generators/win32/msvc_vcproj.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'qmake') diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 79450420cc..676dee3dd0 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -943,6 +943,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 ; -- cgit v1.2.3