diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 18:52:38 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 18:52:38 +0100 |
| commit | f6dbdd9c16166f345fd5743886229192c97c2c4f (patch) | |
| tree | 05e5e7b806dd627be4e3ba6fc9a32f115847acb0 /qmake/generators/win32/msvc_nmake.cpp | |
| parent | b8084618545570a8832d344a2e9586e1226cc697 (diff) | |
| parent | 47efa9213d92a4366e03bd6d056837cd5bbadb1e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/sql/drivers/sqlite/qsql_sqlite.cpp
Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd
Diffstat (limited to 'qmake/generators/win32/msvc_nmake.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 6d148e41a2..e742288c35 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -253,10 +253,11 @@ 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"))) { + || project->first("TEMPLATE") != "lib" + || (project->isActiveConfig("shared") + && project->values(ProKey(t + ".CONFIG")).indexOf("no_dll") == -1)) { QString pdb_target = getPdbTarget(); pdb_target.remove('"'); QString src_targ = (project->isEmpty("DESTDIR") ? QString("$(DESTDIR)") : project->first("DESTDIR")) + pdb_target; @@ -407,11 +408,15 @@ void NmakeMakefileGenerator::init() if(project->isActiveConfig("shared")) { project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".exp"); } - if(project->isActiveConfig("debug")) { - project->values("QMAKE_DISTCLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".pdb"); + if (project->isActiveConfig("debug_info")) { + QString pdbfile = project->first("DESTDIR") + project->first("TARGET") + version + ".pdb"; + project->values("QMAKE_CFLAGS").append("/Fd" + pdbfile); + project->values("QMAKE_CXXFLAGS").append("/Fd" + pdbfile); + project->values("QMAKE_DISTCLEAN").append(pdbfile); + } + if (project->isActiveConfig("debug")) { 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("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".idb"); } else { ProStringList &defines = project->values("DEFINES"); if (!defines.contains("NDEBUG")) |