diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-06-09 09:41:38 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-06-09 09:41:38 (GMT) |
| commit | bc3abd32ed1c5a872d7a7817c1af0a13f442d536 (patch) | |
| tree | 37d617a7baf54844bb4c396628b867ecb3b0b29e /qmake/generators/makefile.cpp | |
| parent | 6d25d222b2bb418139e123b59366db908ee3188a (diff) | |
| parent | 91ceb21d1d5f6447a47853b6625fb51d2f21cf16 (diff) | |
| download | Qt-bc3abd32ed1c5a872d7a7817c1af0a13f442d536.zip Qt-bc3abd32ed1c5a872d7a7817c1af0a13f442d536.tar.gz Qt-bc3abd32ed1c5a872d7a7817c1af0a13f442d536.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -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; |