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

fix c-quoting of strings which contain quotes

Browse Source 
escape backslashes before the quotes, as otherwise we'd escape the
backslashes we just used to escape the quotes.

Change-Id: I88e12c0c2cfc53e0ab8dce9807b06dfce6aa6e78
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-07-17 16:15:17 +02:00 committed by The Qt Project
parent f57e2f5667
commit ff6265bfc2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -899,8 +899,8 @@ QString Win32MakefileGenerator::escapeFilePath(const QString &path) const
QString Win32MakefileGenerator::cQuoted(const QString &str) QString Win32MakefileGenerator::cQuoted(const QString &str)
{ {
QString ret = str; QString ret = str;
ret.replace(QLatin1Char('"'), QStringLiteral("\\\""));
ret.replace(QLatin1Char('\\'), QStringLiteral("\\\\")); ret.replace(QLatin1Char('\\'), QStringLiteral("\\\\"));
ret.replace(QLatin1Char('"'), QStringLiteral("\\\""));
ret.prepend(QLatin1Char('"')); ret.prepend(QLatin1Char('"'));
ret.append(QLatin1Char('"')); ret.append(QLatin1Char('"'));
return ret; return ret;