diff options
| author | Leonard Lee <leonard.lee@digia.com> | 2013-06-14 10:56:19 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-17 05:37:37 (GMT) |
| commit | a9a468e0967448f6dcfd85264afa18d68e9e0c23 (patch) | |
| tree | 2f5f9706ee06c89e9f24faf9437619f561e957cc /src/corelib/kernel | |
| parent | 8d23f522c29dc2983cf2eae46a9259da326fc8b5 (diff) | |
| download | Qt-a9a468e0967448f6dcfd85264afa18d68e9e0c23.zip Qt-a9a468e0967448f6dcfd85264afa18d68e9e0c23.tar.gz Qt-a9a468e0967448f6dcfd85264afa18d68e9e0c23.tar.bz2 | |
Implement apostrophe in windows cmd args.
Task-number: QTBUG-15379
Change-Id: I113692983a8c16c56f0f684146d0d32e25d4869d
(cherry-picked from qtbase/c1e24f883824ad894aa121568e4fde8553028d95)
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcorecmdlineargs_p.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/corelib/kernel/qcorecmdlineargs_p.h b/src/corelib/kernel/qcorecmdlineargs_p.h index f699fbd..b0c0ff2 100644 --- a/src/corelib/kernel/qcorecmdlineargs_p.h +++ b/src/corelib/kernel/qcorecmdlineargs_p.h @@ -103,11 +103,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++; |