diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-01-15 16:11:09 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-01-15 16:11:09 (GMT) |
| commit | 13240f5f0cdb08ec4dbb80482bd0d7d95cb6b530 (patch) | |
| tree | c2dadf2c74e4e5b663d57cab23e096a56b5e9039 /qmake | |
| parent | 51fe84689320f9443117196fec2ee25c6353b79b (diff) | |
| parent | 7e22fb22acffe1d0f101a8ab3ef05a4ef7ad9b83 (diff) | |
| download | Qt-13240f5f0cdb08ec4dbb80482bd0d7d95cb6b530.zip Qt-13240f5f0cdb08ec4dbb80482bd0d7d95cb6b530.tar.gz Qt-13240f5f0cdb08ec4dbb80482bd0d7d95cb6b530.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 4a01a89..7424d1d 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2411,16 +2411,14 @@ 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); - if(in.startsWith(in_directory)) - in = in.mid(in_directory.length()); + QString out = subtarget->makefile; + QString in = fileFixify(in_directory + subtarget->profile, out_directory, QString(), FileFixifyAbsolute); 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 + t << mkdir_p_asstring(out_directory) + << out_directory_cdin << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out << in_directory_cdout << endl; } else { @@ -2431,8 +2429,8 @@ 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 + t << mkdir_p_asstring(out_directory) + << out_directory_cdin << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out << in_directory_cdout << endl; } else { |