From 84f381b98a9a100007a9d40a26e30f0bf705037b Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Fri, 5 Jun 2009 13:06:06 +0200
Subject: Made qmake handle "no_default" config for sub targets

Merge-request: 395
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
---
 qmake/generators/makefile.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 67e5bfb..2d4658e 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2463,7 +2463,12 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
 
         t << suffix << ":";
         for(int target = 0; target < targets.size(); ++target) {
-            QString targetRule = targets.at(target)->target + "-" + suffix;
+            SubTarget *subTarget = targets.at(target);
+            if((suffix == "make_first" || suffix == "make_default")
+                && project->values(subTarget->name + ".CONFIG").indexOf("no_default_target") != -1) {
+                continue;
+            }
+            QString targetRule = subTarget->target + "-" + suffix;
             if(flags & SubTargetOrdered)
                 targetRule += "-ordered";
             t << " " << targetRule;
-- 
cgit v0.12