From f90607870a5262e6627429ef86ac325a6f307b6e Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 9 Apr 2013 14:32:06 +0200 Subject: [PATCH] qmake/nmake: do not remove NDEBUG from DEFINES In ebc4fb45 all NDEBUG defines were removed from DEFINES to adjust the nmake generator's behavior to the vcproj generator. Turns out that the vcproj generator did it wrong. The user must be able to specify NDEBUG in DEFINES. Change-Id: Iaaf3915ac79acbbd1e7a3172ad3951d0d686041b Reviewed-by: Kai Koehne Reviewed-by: Oswald Buddenhagen --- qmake/generators/win32/msvc_nmake.cpp | 1 - qmake/generators/win32/msvc_vcproj.cpp | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index ee53f94d90..e2c9fdbf37 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -307,7 +307,6 @@ void NmakeMakefileGenerator::init() project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".ilk"); project->values("QMAKE_CLEAN").append("vc*.pdb"); project->values("QMAKE_CLEAN").append("vc*.idb"); - project->values("DEFINES").removeAll("NDEBUG"); } else { ProStringList &defines = project->values("DEFINES"); if (!defines.contains("NDEBUG")) diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 793c2ad1ad..d3187bacb5 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -981,12 +981,8 @@ void VcprojGenerator::initConfiguration() initDeploymentTool(); initPreLinkEventTools(); - // Set definite values in both configurations - if (isDebug) { - conf.compiler.PreprocessorDefinitions.removeAll("NDEBUG"); - } else { + if (!isDebug) conf.compiler.PreprocessorDefinitions += "NDEBUG"; - } } void VcprojGenerator::initCompilerTool()