diff options
| author | Debao Zhang <hello@debao.me> | 2012-10-18 14:42:15 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-11 16:27:22 (GMT) |
| commit | 38cb37f0516ba03b062f4256bc3349c84a9da869 (patch) | |
| tree | da01f63e027611cea1e469dab767608acabd584b /qmake/generators | |
| parent | 3ad159d54cfe70e50cd7788f9774ea8c378bfcaa (diff) | |
| download | Qt-38cb37f0516ba03b062f4256bc3349c84a9da869.zip Qt-38cb37f0516ba03b062f4256bc3349c84a9da869.tar.gz Qt-38cb37f0516ba03b062f4256bc3349c84a9da869.tar.bz2 | |
qmake ExtraCompilerTargets: deal with file name which contains space
Task-number: QTBUG-27629
Change-Id: I6d6c3345cc1bb0a866524df3a1534ed50fc00f3e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/b340e40f9185d2f4ec59ce3313447419580fe6ee)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/generators')
| -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 021a9f5..0ef9254 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1988,7 +1988,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) QString in = Option::fixPathToTargetOS((*input), false); QStringList deps = findDependencies((*input)); deps += escapeDependencyPath(in); - QString out = replaceExtraCompilerVariables(tmp_out, (*input), QString()); + QString out = unescapeFilePath(replaceExtraCompilerVariables(tmp_out, (*input), QString())); if(!tmp_dep.isEmpty()) { QStringList pre_deps = fileFixify(tmp_dep, Option::output_dir, Option::output_dir); for(int i = 0; i < pre_deps.size(); ++i) |