From 272fcac4d7e1eda0d57532ee36df0176f0bb1f34 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 18 Nov 2013 20:39:33 +0100 Subject: 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 --- qmake/generators/win32/msvc_nmake.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qmake') 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; -- cgit v1.2.3