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>

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 131bbb5..a3e4b11 100644 (file)
--- 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";