diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-11-18 20:39:33 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-03 09:14:12 +0100 |
| commit | 272fcac4d7e1eda0d57532ee36df0176f0bb1f34 (patch) | |
| tree | 69be871c3bf576906d9db814439abd3213d83f3e /qmake/generators/win32/msvc_nmake.cpp | |
| parent | 26a0a3ed85008c3a0edae125fca48c7c36a7437f (diff) | |
make CONFIG+=no_dll affect pdb files as well
this option suppresses the installation of target (leaving only
dlltarget). however, it still installed target's pdb file.
Change-Id: Ia686a647c101ca66e74944d23171e120fc74515a
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 723f2a03e9..06277b095d 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -238,7 +238,8 @@ QString NmakeMakefileGenerator::defaultInstall(const QString &t) if (project->isActiveConfig("debug")) { if (t == "dlltarget" || (project->first("TEMPLATE") == "lib" - && project->isActiveConfig("shared"))) { + && 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; |