diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-08-03 11:06:03 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-08-10 08:52:54 (GMT) |
| commit | e0ca32a845fef14d569203056e617ead1adec62c (patch) | |
| tree | 2c6a5c379d1b4a9058572470df13eada56704e98 /qmake/generators/win32 | |
| parent | 1aca3a1c6d104e52a15039cdbbe88a5e55c9235e (diff) | |
| download | Qt-e0ca32a845fef14d569203056e617ead1adec62c.zip Qt-e0ca32a845fef14d569203056e617ead1adec62c.tar.gz Qt-e0ca32a845fef14d569203056e617ead1adec62c.tar.bz2 | |
qmake msvc generator: remove unneeded handling of variables
win32/thread.prf takes care of handling the following variables:
MAKE_CXXFLAGS_MT_DLLDBG
MAKE_CXXFLAGS_MT_DBG
MAKE_CXXFLAGS_MT_DLL
MAKE_CXXFLAGS_MT
No need to do that in the MSVC generators.
It was incorrectly implemented anyway.
Reviewed-by: ossi
Diffstat (limited to 'qmake/generators/win32')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 13 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcxproj.cpp | 13 |
2 files changed, 2 insertions, 24 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 8686ae8..bd3f183 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -916,20 +916,9 @@ void VcprojGenerator::initCompilerTool() } conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS")); - if(project->isActiveConfig("debug")){ - // Debug version - if((projectTarget == Application) || (projectTarget == StaticLib)) - conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_MT_DBG")); - else - conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_MT_DLLDBG")); - } else { - // Release version + if(project->isActiveConfig("release")) { conf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG"; conf.compiler.PreprocessorDefinitions += "NDEBUG"; - if((projectTarget == Application) || (projectTarget == StaticLib)) - conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_MT")); - else - conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_MT_DLL")); } // Common for both release and debug diff --git a/qmake/generators/win32/msvc_vcxproj.cpp b/qmake/generators/win32/msvc_vcxproj.cpp index f68a435..609f00f 100644 --- a/qmake/generators/win32/msvc_vcxproj.cpp +++ b/qmake/generators/win32/msvc_vcxproj.cpp @@ -292,20 +292,9 @@ void VcxprojGenerator::initCompilerTool() } conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS")); - if(project->isActiveConfig("debug")){ - // Debug version - if((projectTarget == Application) || (projectTarget == StaticLib)) - conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_MT_DBG")); - else - conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_MT_DLLDBG")); - } else { - // Release version + if(project->isActiveConfig("release")) { conf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG"; conf.compiler.PreprocessorDefinitions += "NDEBUG"; - if((projectTarget == Application) || (projectTarget == StaticLib)) - conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_MT")); - else - conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_MT_DLL")); } // Common for both release and debug |