From e0ca32a845fef14d569203056e617ead1adec62c Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 3 Aug 2010 13:06:03 +0200 Subject: 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 --- qmake/generators/win32/msvc_vcproj.cpp | 13 +------------ 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 -- cgit v0.12