diff options
Diffstat (limited to 'qmake/generators/win32')
-rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 8 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index f02574e465..2a2e6b93ca 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -235,7 +235,7 @@ QString NmakeMakefileGenerator::defaultInstall(const QString &t) if(targetdir.right(1) != Option::dir_sep) targetdir += Option::dir_sep; - if (project->isActiveConfig("debug")) { + if (project->isActiveConfig("debug_info")) { if (t == "dlltarget" || project->first("TEMPLATE") != "lib" || (project->isActiveConfig("shared") @@ -390,10 +390,12 @@ void NmakeMakefileGenerator::init() if(project->isActiveConfig("shared")) { project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".exp"); } - if(project->isActiveConfig("debug")) { + if (project->isActiveConfig("debug_info")) { project->values("QMAKE_DISTCLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".pdb"); - project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".ilk"); project->values("QMAKE_CLEAN").append("vc*.pdb"); + } + if (project->isActiveConfig("debug")) { + project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".ilk"); project->values("QMAKE_CLEAN").append("vc*.idb"); } else { ProStringList &defines = project->values("DEFINES"); diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 934902fd4a..fbc2f6b0a6 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -932,7 +932,7 @@ void VcprojGenerator::initConfiguration() if(projectTarget == StaticLib) initLibrarianTool(); else { - conf.linker.GenerateDebugInformation = isDebug ? _True : _False; + conf.linker.GenerateDebugInformation = project->isActiveConfig("debug_info") ? _True : _False; initLinkerTool(); } initManifestTool(); |