1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't fail to fix path separators in extra compilers' clean targets

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2015-04-22 23:49:22 +02:00
parent f228404c24
commit e8dc128d1d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qmake/generators/makefile.cpp
View File

@ -1853,7 +1853,9 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
QStringList raw_clean = project->values(ProKey(*it + ".clean")).toQStringList(); QStringList raw_clean = project->values(ProKey(*it + ".clean")).toQStringList();
if (raw_clean.isEmpty()) if (raw_clean.isEmpty())
raw_clean << tmp_out; 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(' '); QString tmp_clean_cmds = project->values(ProKey(*it + ".clean_commands")).join(' ');
if(!tmp_inputs.isEmpty()) if(!tmp_inputs.isEmpty())
clean_targets += QString("compiler_" + (*it) + "_clean "); clean_targets += QString("compiler_" + (*it) + "_clean ");
@ -1866,7 +1868,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
wrote_clean_cmds = true; wrote_clean_cmds = true;
} }
if(tmp_clean.indexOf("${QMAKE_") == -1) { if(tmp_clean.indexOf("${QMAKE_") == -1) {
t << "\n\t-$(DEL_FILE) " << tmp_clean; t << "\n\t-$(DEL_FILE)" << tmp_clean;
wrote_clean = true; wrote_clean = true;
} }
if(!wrote_clean_cmds || !wrote_clean) { if(!wrote_clean_cmds || !wrote_clean) {