diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-03-22 11:27:23 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-22 15:07:46 (GMT) |
| commit | e98362e20a0ed4f4f889c9dc1bcf0f85653d36eb (patch) | |
| tree | 5d8a98f6422da56f01e04d6ab77c732c5c4a0dab /qmake/generators | |
| parent | 25db638d26a0d3ca6a403987d40e142f498b21ad (diff) | |
| download | Qt-e98362e20a0ed4f4f889c9dc1bcf0f85653d36eb.zip Qt-e98362e20a0ed4f4f889c9dc1bcf0f85653d36eb.tar.gz Qt-e98362e20a0ed4f4f889c9dc1bcf0f85653d36eb.tar.bz2 | |
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 <andy.shaw@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 7945042..676dee3 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 ; |