Make qmake respect <subdir>.CONFIG = no_default_install
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>
Thu, 24 Feb 2011 19:01:18 +0000 (13:01 -0600)
committeraxis <qt-info@nokia.com>
Wed, 27 Apr 2011 10:05:58 +0000 (12:05 +0200)
It already respects no_default_target

qmake/generators/makefile.cpp

index 4f3b113..61e7ac5 100644 (file)
@@ -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";