From 2b8c3ff0f005221d0ccad612ffa16a5e37b78af0 Mon Sep 17 00:00:00 2001 From: Mikko Knuutila Date: Fri, 11 Nov 2011 14:15:29 +0100 Subject: 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 (cherry picked from commit ee3f763f3642d1a098e6293fbc586b34a3e6e8be) Change-Id: Iee3f763f3642d1a098e6293fbc586b34a3e6e8be --- src/gui/util/qvalidator.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/gui/util/qvalidator.cpp') 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; } -- cgit v1.2.3