diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-11-18 21:39:08 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-03 09:14:59 +0100 |
| commit | a5f6536d9fbde11796d3c7f1a9db3fd34e83c2a5 (patch) | |
| tree | d45649fdb900ff448cbd52678c0b0971990335a0 /qmake/generators/win32/msvc_nmake.cpp | |
| parent | c31ab2139a237d60a5b14143a5c98ac6d8d57f32 (diff) | |
complete implementation of force_debug_info
that means further detaching the generation and installation of debug
info from the thing calling itself A Debug Build.
Task-number: QTBUG-32412
Change-Id: I4d79d1ae4806c8e4a2d6a7ccd030fb88385dd7d4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/generators/win32/msvc_nmake.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 8 |
1 files changed, 5 insertions, 3 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"); |