diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-04 19:02:49 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-07 17:37:13 +0200 |
| commit | 362c75f7c10cb6aefdc638142dd3f8e1a74329cc (patch) | |
| tree | 4e70f9bbd9ec6e97c3d9371744d92ceff82f4a2b /qmake | |
| parent | 1a4fc0a129e330b9d80f87cb3e16ffe3b2968fab (diff) | |
in command line args, escape tabs as well
Task-number: QTBUG-27154
Change-Id: I4a204b2bf2231027db55a444f304190c3b30878c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 3 | ||||
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index c11259d5a1..4c3df4efe8 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -921,7 +921,8 @@ UnixMakefileGenerator::escapeFilePath(const QString &path) const { QString ret = path; 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()); } return ret; diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 484062d56e..da81b85e2a 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -883,7 +883,7 @@ QString Win32MakefileGenerator::escapeFilePath(const QString &path) const QString ret = path; if(!ret.isEmpty()) { ret = unescapeFilePath(ret); - if(ret.contains(" ")) + if (ret.contains(' ') || ret.contains('\t')) ret = "\"" + ret + "\""; debug_msg(2, "EscapeFilePath: %s -> %s", path.toLatin1().constData(), ret.toLatin1().constData()); } |