diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-22 23:49:22 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-23 09:50:58 +0000 |
| commit | e8dc128d1d327bbd6168e4321a67c2b074ffa726 (patch) | |
| tree | 325ad824b57058c328e61c8e144ecc3fb38672f2 | |
| parent | f228404c24975083ada62c2b0bfce2d4527d5a27 (diff) | |
don't fail to fix path separators in extra compilers' clean targets
this affects only files explicitly listed via the .clean member without
placeholders, so more or less a corner case.
Change-Id: I7bd55948130aaee116d1a4bebbad0c445b76197b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | qmake/generators/makefile.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 2904f01c5f..2106d0869b 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1853,7 +1853,9 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) QStringList raw_clean = project->values(ProKey(*it + ".clean")).toQStringList(); if (raw_clean.isEmpty()) raw_clean << tmp_out; - QString tmp_clean = escapeFilePaths(raw_clean).join(' '); + QString tmp_clean; + foreach (const QString &rc, raw_clean) + tmp_clean += ' ' + escapeFilePath(Option::fixPathToTargetOS(rc)); QString tmp_clean_cmds = project->values(ProKey(*it + ".clean_commands")).join(' '); if(!tmp_inputs.isEmpty()) clean_targets += QString("compiler_" + (*it) + "_clean "); @@ -1866,7 +1868,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) wrote_clean_cmds = true; } if(tmp_clean.indexOf("${QMAKE_") == -1) { - t << "\n\t-$(DEL_FILE) " << tmp_clean; + t << "\n\t-$(DEL_FILE)" << tmp_clean; wrote_clean = true; } if(!wrote_clean_cmds || !wrote_clean) { |