diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 15:59:32 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 15:59:34 +0100 |
| commit | 777cdb00e704b987ad19bf842088a754cf7e6525 (patch) | |
| tree | b8f2356d68e293c591c9be86113ed46478867e0b /src/corelib/tools/qlocale_p.h | |
| parent | dc9e32caeda0278658befb8bb6e944986c021620 (diff) | |
| parent | af1dbfd2239c7834187f3a702fb2029dc78d4526 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ibb342cc5fc55ff9a3f4b3ecbd53936b57bc13e63
Diffstat (limited to 'src/corelib/tools/qlocale_p.h')
| -rw-r--r-- | src/corelib/tools/qlocale_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index 4b4606ffab..581a12e0c7 100644 --- a/src/corelib/tools/qlocale_p.h +++ b/src/corelib/tools/qlocale_p.h @@ -360,10 +360,10 @@ inline char QLocalePrivate::digitToCLocale(QChar in) const if (in.unicode() >= '0' && in.unicode() <= '9') return in.toLatin1(); - if (in == plus()) + if (in == plus() || in == QLatin1Char('+')) return '+'; - if (in == minus()) + if (in == minus() || in == QLatin1Char('-') || in == QChar(0x2212)) return '-'; if (in == decimal()) |