From bd06459179c23ca6e46133834f5f40706e6fbf3a Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 24 Feb 2011 13:01:18 -0600 Subject: [PATCH] Make qmake respect .CONFIG = no_default_install It already respects no_default_target --- qmake/generators/makefile.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 4f3b1137f5..61e7ac55ca 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2570,6 +2570,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QListvalues(subTarget->name + ".CONFIG").indexOf("no_default_target") != -1) { continue; } + if((suffix == "install_subtargets" || suffix == "uninstall_subtargets") + && project->values(subTarget->name + ".CONFIG").indexOf("no_default_install") != -1) { + continue; + } QString targetRule = subTarget->target + "-" + suffix; if(flags & SubTargetOrdered) targetRule += "-ordered";