diff options
| author | Joerg Bornemann <joerg.bornemann@trolltech.com> | 2009-04-07 09:26:12 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@trolltech.com> | 2009-04-07 09:26:12 (GMT) |
| commit | d8f76432c3937690c37972136c02a5a264bc941f (patch) | |
| tree | bba5e98f3f7a25de671d591140d5f11b856043fe /qmake | |
| parent | 3279b07302fde0eb14f9b197c9ad2e14d512817e (diff) | |
| download | Qt-d8f76432c3937690c37972136c02a5a264bc941f.zip Qt-d8f76432c3937690c37972136c02a5a264bc941f.tar.gz Qt-d8f76432c3937690c37972136c02a5a264bc941f.tar.bz2 | |
qmake: additional compiler options were written twice into vcproj files
In the function initCompilerTool we handled QMAKE_CXXFLAGS twice for
every configuration (debug / release).
The call of parseOptions before the if clause is enough.
Reviewed-by: mariusSO
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 08159b0..8901289 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1030,7 +1030,6 @@ void VcprojGenerator::initCompilerTool() conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS")); if(project->isActiveConfig("debug")){ // Debug version - conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS")); conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_DEBUG")); if((projectTarget == Application) || (projectTarget == StaticLib)) conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_MT_DBG")); @@ -1038,7 +1037,6 @@ void VcprojGenerator::initCompilerTool() conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_MT_DLLDBG")); } else { // Release version - conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS")); conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_RELEASE")); conf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG"; conf.compiler.PreprocessorDefinitions += "NDEBUG"; |