diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-29 12:42:35 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-04-12 10:00:35 (GMT) |
| commit | 8b11ebf392d832725185de08c2438d6b8771890b (patch) | |
| tree | 233984490d1531f10d17324d78b47d6618724aad /qmake | |
| parent | 26dd9a45c3b1e92c356ee7f80f728e2ddca0c1d8 (diff) | |
| download | Qt-8b11ebf392d832725185de08c2438d6b8771890b.zip Qt-8b11ebf392d832725185de08c2438d6b8771890b.tar.gz Qt-8b11ebf392d832725185de08c2438d6b8771890b.tar.bz2 | |
fixify target source against build tree
that's where one would expect a target, after all.
affects only extra targets explicitly requesting fixification, i.e.,
nothing.
Reviewed-by: mariusSO
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index d096eb4..3c5948f 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1747,7 +1747,7 @@ MakefileGenerator::writeExtraTargets(QTextStream &t) deps += " " + escapeDependencyPath(dep); } if(project->values((*it) + ".CONFIG").indexOf("fix_target") != -1) - targ = fileFixify(targ); + targ = fileFixify(targ, Option::output_dir, Option::output_dir); if(project->isEmpty("QMAKE_NOFORCE") && project->values((*it) + ".CONFIG").indexOf("phony") != -1) deps += QString(" ") + "FORCE"; |