summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2011-02-24 13:01:18 -0600
committeraxis <qt-info@nokia.com>2011-04-27 12:05:58 +0200
commitbd06459179c23ca6e46133834f5f40706e6fbf3a (patch)
tree8b2f8801c721ecec2f1ec37aa6fc2319c3452da0 /qmake/generators
parent88dd54405f463025a7ba342a5e49314190659b4a (diff)
Make qmake respect <subdir>.CONFIG = no_default_install
It already respects no_default_target
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/makefile.cpp4
1 files changed, 4 insertions, 0 deletions
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, QList<MakefileGenerator::SubT
&& project->values(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";