diff options
author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2010-11-17 18:02:30 +0200 |
---|---|---|
committer | Armin Berres <armin.berres@basyskom.de> | 2010-11-18 14:26:44 +0100 |
commit | 635494e805afed5250cdc9e759bbb52c1686ce78 (patch) | |
tree | 56768c2eca16ad68f21159451220a87c970c119b | |
parent | 1cd47471d20f52af2d92d1eccb66125d66c2ad84 (diff) |
Fixes: NB#196070 - Phone number text edit allows extra characters to be inserted
RevBy: Michael Hasselmann
Details: removed / and . from allowed characters.
-rwxr-xr-x | src/corelib/widgets/mtextedit.cpp | 2 | ||||
-rw-r--r-- | tests/ut_mtextedit/ut_mtextedit.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/widgets/mtextedit.cpp b/src/corelib/widgets/mtextedit.cpp index 968f7de6..dad4f1e3 100755 --- a/src/corelib/widgets/mtextedit.cpp +++ b/src/corelib/widgets/mtextedit.cpp @@ -280,7 +280,7 @@ namespace .arg(QChar(0x066B)); // Arabic decimal separator //! character set for Phone Number field type - const QString PhoneNumberCharacterSet = QString("[\\+0-9%1-%2#\\*\\-\\+pw.\\/() ]+") + const QString PhoneNumberCharacterSet = QString("[\\+0-9%1-%2#\\*\\-\\+pw() ]+") .arg(QChar(0x0660)) // Arabic numbers begin .arg(QChar(0x0669)); // Arabic numbers end diff --git a/tests/ut_mtextedit/ut_mtextedit.cpp b/tests/ut_mtextedit/ut_mtextedit.cpp index 96a154df..44ae9957 100644 --- a/tests/ut_mtextedit/ut_mtextedit.cpp +++ b/tests/ut_mtextedit/ut_mtextedit.cpp @@ -711,7 +711,7 @@ void Ut_MTextEdit::testConstraints() // Test phone number singleLine.setContentType(M::PhoneNumberContentType); QCOMPARE(singleLine.contentType(), M::PhoneNumberContentType); - constraintTest(&singleLine, testInput, "1234*/+-#()"); + constraintTest(&singleLine, testInput, "1234*+-#()"); // Test email address singleLine.setContentType(M::EmailContentType); |