diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-08-03 12:04:35 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-08-10 08:52:55 (GMT) |
| commit | 430cbd2f089302ceb7992f71a5d05d7a18863c6e (patch) | |
| tree | 71bdb91b77bf8b4ac2dc9f55aa6201716b223b53 /qmake | |
| parent | e0ca32a845fef14d569203056e617ead1adec62c (diff) | |
| download | Qt-430cbd2f089302ceb7992f71a5d05d7a18863c6e.zip Qt-430cbd2f089302ceb7992f71a5d05d7a18863c6e.tar.gz Qt-430cbd2f089302ceb7992f71a5d05d7a18863c6e.tar.bz2 | |
qmake: don't add QT_NO_DEBUG in msvc generators
This is already done in qt.prf.
Reviewed-by: ossi
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 | ||||
| -rw-r--r-- | 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")) |