diff options
| author | J-P Nurmi <jpnurmi@gmail.com> | 2009-06-05 11:06:06 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2009-06-05 11:07:18 (GMT) |
| commit | 84f381b98a9a100007a9d40a26e30f0bf705037b (patch) | |
| tree | 2391b8484b85de55d941fa060dc4ec3286cb38ef /qmake | |
| parent | f04af57ba71e8a4cd3c19f6e1a283290cc5280d4 (diff) | |
| download | Qt-84f381b98a9a100007a9d40a26e30f0bf705037b.zip Qt-84f381b98a9a100007a9d40a26e30f0bf705037b.tar.gz Qt-84f381b98a9a100007a9d40a26e30f0bf705037b.tar.bz2 | |
Made qmake handle "no_default" config for sub targets
Merge-request: 395
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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; |