diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2011-05-11 10:24:46 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2011-05-11 10:24:46 (GMT) |
| commit | fab911a64a72d5b7f450f3f3616e38c96d601553 (patch) | |
| tree | e7bf700b0b4a14ca53625d264290ea57d13761a3 /qmake | |
| parent | 3edf2608f572982f5ef7c89d4772d2d28b635c69 (diff) | |
| download | Qt-fab911a64a72d5b7f450f3f3616e38c96d601553.zip Qt-fab911a64a72d5b7f450f3f3616e38c96d601553.tar.gz Qt-fab911a64a72d5b7f450f3f3616e38c96d601553.tar.bz2 | |
fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e
Reviewed-by: TrustMe
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index c3d3933..8768861 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2524,7 +2524,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT t << " " << targets.at(target-1)->target << "-" << targetSuffixes.at(suffix) << "-ordered "; if(project->isEmpty("QMAKE_NOFORCE")) t << " FORCE"; - writeSubMakeCall(t, out_directory_cdin, makefilein, out_directory_cdout); + writeSubMakeCall(t, out_directory_cdin, makefilein + " " + s, out_directory_cdout); } t << subtarget->target << "-" << targetSuffixes.at(suffix) << ": " << mkfile; if(!subtarget->depends.isEmpty()) @@ -2532,7 +2532,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT "-"+targetSuffixes.at(suffix)); if(project->isEmpty("QMAKE_NOFORCE")) t << " FORCE"; - writeSubMakeCall(t, out_directory_cdin, makefilein, out_directory_cdout); + writeSubMakeCall(t, out_directory_cdin, makefilein + " " + s, out_directory_cdout); } } t << endl; |