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 <kai.koehne@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
parent
1abeb85464
commit
f90607870a
@ -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"))
|
||||
|
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user