From 65ee9147e4c87d46f1ff54412afafe29a857b562 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 --- qtbase/qmake/generators/makefile.cpp | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/qtbase/qmake/generators/makefile.cpp b/qtbase/qmake/generators/makefile.cpp index 4f3b113..61e7ac5 100644 --- a/qtbase/qmake/generators/makefile.cpp +++ b/qtbase/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"; -- 1.7.3.4