From 430cbd2f089302ceb7992f71a5d05d7a18863c6e Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 3 Aug 2010 14:04:35 +0200 Subject: qmake: don't add QT_NO_DEBUG in msvc generators This is already done in qt.prf. Reviewed-by: ossi --- qmake/generators/win32/msvc_vcproj.cpp | 4 +--- qmake/generators/win32/msvc_vcxproj.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index bd3f183..5abe26e 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -916,10 +916,8 @@ void VcprojGenerator::initCompilerTool() } conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS")); - if(project->isActiveConfig("release")) { - conf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG"; + if(project->isActiveConfig("release")) conf.compiler.PreprocessorDefinitions += "NDEBUG"; - } // Common for both release and debug if(project->isActiveConfig("windows")) diff --git a/qmake/generators/win32/msvc_vcxproj.cpp b/qmake/generators/win32/msvc_vcxproj.cpp index 609f00f..d12e809 100644 --- a/qmake/generators/win32/msvc_vcxproj.cpp +++ b/qmake/generators/win32/msvc_vcxproj.cpp @@ -292,10 +292,8 @@ void VcxprojGenerator::initCompilerTool() } conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS")); - if(project->isActiveConfig("release")) { - conf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG"; + if(project->isActiveConfig("release")) conf.compiler.PreprocessorDefinitions += "NDEBUG"; - } // Common for both release and debug if(project->isActiveConfig("windows")) -- cgit v0.12