1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make CONFIG+=no_dll affect pdb files as well

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2013-11-18 20:39:33 +01:00 committed by The Qt Project
parent 26a0a3ed85
commit 272fcac4d7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qmake/generators/win32/msvc_nmake.cpp
View File

@ -238,7 +238,8 @@ QString NmakeMakefileGenerator::defaultInstall(const QString &t)
if (project->isActiveConfig("debug")) { if (project->isActiveConfig("debug")) {
if (t == "dlltarget" if (t == "dlltarget"
|| (project->first("TEMPLATE") == "lib" || (project->first("TEMPLATE") == "lib"
&& project->isActiveConfig("shared"))) { && project->isActiveConfig("shared")
&& project->values(ProKey(t + ".CONFIG")).indexOf("no_dll") == -1)) {
QString pdb_target = getPdbTarget(); QString pdb_target = getPdbTarget();
pdb_target.remove('"'); pdb_target.remove('"');
QString src_targ = (project->isEmpty("DESTDIR") ? QString("$(DESTDIR)") : project->first("DESTDIR")) + pdb_target; QString src_targ = (project->isEmpty("DESTDIR") ? QString("$(DESTDIR)") : project->first("DESTDIR")) + pdb_target;