diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-01-13 16:08:55 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-01-13 19:13:26 (GMT) |
| commit | 3531f4c831407016ef0735d9cdff9b193e4b3f92 (patch) | |
| tree | 760bb0cd6c786a364cc03613d2a9328061bd8cc9 /qmake/generators | |
| parent | 6921f084df93fce24417f6a24764665cebe3da1a (diff) | |
| download | Qt-3531f4c831407016ef0735d9cdff9b193e4b3f92.zip Qt-3531f4c831407016ef0735d9cdff9b193e4b3f92.tar.gz Qt-3531f4c831407016ef0735d9cdff9b193e4b3f92.tar.bz2 | |
Fix rules for recreating the Makefile in a subdir
The code generated would always create the Makefile in the sourcedir, even
if you had src!=build
Reviewed-By: Thiago
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/makefile.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 4a01a89..c1ab60b 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2411,17 +2411,17 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT //qmake it if(!subtarget->profile.isEmpty()) { - QString out = out_directory + subtarget->makefile, - in = fileFixify(in_directory + subtarget->profile, in_directory); + QString out = subtarget->makefile; + QString in = fileFixify(in_directory + subtarget->profile, in_directory); if(in.startsWith(in_directory)) in = in.mid(in_directory.length()); if(out.startsWith(in_directory)) out = out.mid(in_directory.length()); t << mkfile << ": " << "\n\t"; if(!in_directory.isEmpty()) { - t << mkdir_p_asstring(in_directory) - << in_directory_cdin - << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out + t << mkdir_p_asstring(out_directory) + << out_directory_cdin + << "$(QMAKE) " << subtarget->in_directory << QDir::separator() << in << buildArgs(in_directory) << " -o " << out << in_directory_cdout << endl; } else { t << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out << endl; @@ -2431,9 +2431,9 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT t << " FORCE"; t << "\n\t"; if(!in_directory.isEmpty()) { - t << mkdir_p_asstring(in_directory) - << in_directory_cdin - << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out + t << mkdir_p_asstring(out_directory) + << out_directory_cdin + << "$(QMAKE) " << subtarget->in_directory << QDir::separator() << in << buildArgs(in_directory) << " -o " << out << in_directory_cdout << endl; } else { t << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out << endl; |