From 76f0ce06e2e75a3f99ea87fa4ef4ebcfdf758db2 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 30 May 2012 12:33:34 +0200
Subject: [PATCH] make 'qmake_all' targets respect .depends and CONFIG+=ordered

Change-Id: I010a9886ee0d40e4319cb6bd873b038336a42111
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 qmake/generators/makefile.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 131bbb5..a3e4b11 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2473,6 +2473,13 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
                 t << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out << endl;
             }
             t << subtarget->target << "-qmake_all: ";
+            if (flags & SubTargetOrdered) {
+                if (target)
+                    t << targets.at(target - 1)->target << "-qmake_all";
+            } else {
+                if (!subtarget->depends.isEmpty())
+                    t << valGlue(subtarget->depends, QString(), "-qmake_all ", "-qmake_all");
+            }
             if(project->isEmpty("QMAKE_NOFORCE"))
                 t <<  " FORCE";
             t << "\n\t";
-- 
2.7.4