From c1e24f883824ad894aa121568e4fde8553028d95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@digia.com>
Date: Tue, 7 May 2013 12:55:54 +0200
Subject: [PATCH] Implement apostrophe in windows cmd args
Task-number: QTBUG-15379
Change-Id: I4a2ca942d2dbfa490302858b589e00bd91e25636
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
---
src/corelib/kernel/qcorecmdlineargs_p.h | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/corelib/kernel/qcorecmdlineargs_p.h b/src/corelib/kernel/qcorecmdlineargs_p.h
index 8292b218226..17a03a5b2dd 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++;
--
GitLab