diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-30 12:33:34 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:46:05 +0200 |
| commit | 76f0ce06e2e75a3f99ea87fa4ef4ebcfdf758db2 (patch) | |
| tree | de59f3cb529a64d010200c2b2d8ade981122c747 /qmake | |
| parent | 2bbd50c6e4b33b342f4d69c587c07afc964a9cb2 (diff) | |
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>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 131bbb5303..a3e4b117ef 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"; |