diff options
| author | Mikko Knuutila <Mikko.Knuutila@Digia.com> | 2011-11-11 14:15:29 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-14 10:34:41 +0100 |
| commit | 2b8c3ff0f005221d0ccad612ffa16a5e37b78af0 (patch) | |
| tree | c3247e60b187c347a65f23cd8ce772044f42ba65 /src/gui/util | |
| parent | d7695e82ac7a835160ffe3424a745e31eec2a32e (diff) | |
Added base 10 to be used with QIntValidator.
Fixes an error in QIntValidator, which occurred because
locale.toInt() was missing a parameter for base value and this
led it to presume wrongly that a base 8 is in use.
Task-number: QTBUG-21602
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit ee3f763f3642d1a098e6293fbc586b34a3e6e8be)
Change-Id: Iee3f763f3642d1a098e6293fbc586b34a3e6e8be
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qvalidator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp index fa3493b59a..37997c0359 100644 --- a/src/gui/util/qvalidator.cpp +++ b/src/gui/util/qvalidator.cpp @@ -415,8 +415,9 @@ QValidator::State QIntValidator::validate(QString & input, int&) const qlonglong entered = QLocalePrivate::bytearrayToLongLong(buff.constData(), 10, &ok, &overflow); if (overflow || !ok) return Invalid; + if (entered >= b && entered <= t) { - locale().toInt(input, &ok); + locale().toInt(input, &ok, 10); return ok ? Acceptable : Intermediate; } |