diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2012-02-10 11:32:43 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-11 13:30:31 +0100 |
| commit | 8b7a9b4898c85e81d87cf642ec59ce85e917ee35 (patch) | |
| tree | 82301f6dd2ff7ee9c83422ae2f00754ddfe4442b | |
| parent | 3791d3b0c2dab448b53720979b2375998d06e209 (diff) | |
Escape project file name in makefile rebuild rules.
Change-Id: I5407c2477613119b5aea2d00eb88cc24d35788ad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | qmake/generators/makefile.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 59e17b0bea..b595486821 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2496,10 +2496,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT if(!in_directory.isEmpty()) { t << mkdir_p_asstring(out_directory) << out_directory_cdin - << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out + << "$(QMAKE) " << escapeFilePath(in) << buildArgs(in_directory) << " -o " << out << in_directory_cdout << endl; } else { - t << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out << endl; + t << "$(QMAKE) " << escapeFilePath(in) << buildArgs(in_directory) << " -o " << out << endl; } t << subtarget->target << "-qmake_all: "; if(project->isEmpty("QMAKE_NOFORCE")) @@ -2508,10 +2508,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT if(!in_directory.isEmpty()) { t << mkdir_p_asstring(out_directory) << out_directory_cdin - << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out + << "$(QMAKE) " << escapeFilePath(in) << buildArgs(in_directory) << " -o " << out << in_directory_cdout << endl; } else { - t << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out << endl; + t << "$(QMAKE) " << escapeFilePath(in) << buildArgs(in_directory) << " -o " << out << endl; } } |