summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@digia.com>2013-05-07 12:55:54 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-10 12:09:41 +0200
commitc1e24f883824ad894aa121568e4fde8553028d95 (patch)
treec82d78b7ca5e023fbd9b6211c1e50da2ca47bfaf /src/corelib/kernel
parent9a7bc0fc1b8d5a8e0ecec05bc91f8018e995006d (diff)
Implement apostrophe in windows cmd args
Task-number: QTBUG-15379 Change-Id: I4a2ca942d2dbfa490302858b589e00bd91e25636 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qcorecmdlineargs_p.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/corelib/kernel/qcorecmdlineargs_p.h b/src/corelib/kernel/qcorecmdlineargs_p.h
index 8292b21822..17a03a5b2d 100644
--- a/src/corelib/kernel/qcorecmdlineargs_p.h
+++ b/src/corelib/kernel/qcorecmdlineargs_p.h
@@ -101,11 +101,8 @@ static QVector<Char*> qWinCmdLine(Char *cmdParam, int length, int &argc)
}
}
if (*p == '\\') { // escape char?
- p++;
- if (*p == Char('\"') || *p == Char('\''))
- ; // yes
- else
- p--; // treat \ literally
+ if (*(p+1) == quote)
+ p++;
} else {
if (!quote && (*p == Char('\"') || *p == Char('\''))) { // " or ' quote
quote = *p++;