From: Oswald Buddenhagen Date: Wed, 30 May 2012 10:33:34 +0000 (+0200) Subject: make 'qmake_all' targets respect .depends and CONFIG+=ordered X-Git-Tag: 071012110112~338^2^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76f0ce06e2e75a3f99ea87fa4ef4ebcfdf758db2;p=profile%2Fivi%2Fqtbase.git make 'qmake_all' targets respect .depends and CONFIG+=ordered Change-Id: I010a9886ee0d40e4319cb6bd873b038336a42111 Reviewed-by: Joerg Bornemann Reviewed-by: Oswald Buddenhagen --- 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, QListtarget << "-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";