diff options
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 1 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 6 |
2 files changed, 1 insertions, 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() |