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

in command line args, escape tabs as well

Browse Source 
Task-number: QTBUG-27154
Change-Id: I4a204b2bf2231027db55a444f304190c3b30878c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2014-04-04 19:02:49 +02:00 committed by The Qt Project
parent 1a4fc0a129
commit 362c75f7c1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qmake/generators/unix/unixmake.cpp
View File

@ -921,7 +921,8 @@ UnixMakefileGenerator::escapeFilePath(const QString &path) const
{ {
QString ret = path; QString ret = path;
if(!ret.isEmpty()) { if(!ret.isEmpty()) {
ret = unescapeFilePath(ret).replace(QLatin1Char(' '), QLatin1String("\\ ")); ret = unescapeFilePath(ret).replace(QLatin1Char(' '), QLatin1String("\\ "))
.replace(QLatin1Char('\t'), QLatin1String("\\\t"));
debug_msg(2, "EscapeFilePath: %s -> %s", path.toLatin1().constData(), ret.toLatin1().constData()); debug_msg(2, "EscapeFilePath: %s -> %s", path.toLatin1().constData(), ret.toLatin1().constData());
} }
return ret; return ret;

2
qmake/generators/win32/winmakefile.cpp
View File

@ -883,7 +883,7 @@ QString Win32MakefileGenerator::escapeFilePath(const QString &path) const
QString ret = path; QString ret = path;
if(!ret.isEmpty()) { if(!ret.isEmpty()) {
ret = unescapeFilePath(ret); ret = unescapeFilePath(ret);
if(ret.contains(" ")) if (ret.contains(' ') || ret.contains('\t'))
ret = "\"" + ret + "\""; ret = "\"" + ret + "\"";
debug_msg(2, "EscapeFilePath: %s -> %s", path.toLatin1().constData(), ret.toLatin1().constData()); debug_msg(2, "EscapeFilePath: %s -> %s", path.toLatin1().constData(), ret.toLatin1().constData());
} }