diff options
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 6 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 |
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 ; |