summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2010-08-03 12:16:25 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2010-08-10 08:52:56 (GMT)
commita746c8dd6a1932f97ee2a4b1ef1821aac876b96b (patch)
treeadf54cd05848a02a3000dec31514bcce045142a5
parent430cbd2f089302ceb7992f71a5d05d7a18863c6e (diff)
downloadQt-a746c8dd6a1932f97ee2a4b1ef1821aac876b96b.zip
Qt-a746c8dd6a1932f97ee2a4b1ef1821aac876b96b.tar.gz
Qt-a746c8dd6a1932f97ee2a4b1ef1821aac876b96b.tar.bz2
qmake: useless addition of the NDEBUG define removed
This already happens in initConfiguration. Reviewed-by: ossi
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp2
-rw-r--r--qmake/generators/win32/msvc_vcxproj.cpp2
2 files changed, 0 insertions, 4 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 5abe26e..4cb8f5a 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -916,8 +916,6 @@ void VcprojGenerator::initCompilerTool()
}
conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS"));
- 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 d12e809..4073961 100644
--- a/qmake/generators/win32/msvc_vcxproj.cpp
+++ b/qmake/generators/win32/msvc_vcxproj.cpp
@@ -292,8 +292,6 @@ void VcxprojGenerator::initCompilerTool()
}
conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS"));
- if(project->isActiveConfig("release"))
- conf.compiler.PreprocessorDefinitions += "NDEBUG";
// Common for both release and debug
if(project->isActiveConfig("windows"))