summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-06 18:22:51 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-06 18:22:51 (GMT)
commit3ec5f0c801645cf8beac52f7eab0c97190f9b46d (patch)
tree75df6fa42e0fd4a914133965a944e21d671bcfa8 /src/gui
parent8c6f2fdf09eb2998cb013659ca7a2154792ffa98 (diff)
parentf870613ee5632c1af87a71948dc302015d1a1d75 (diff)
downloadQt-3ec5f0c801645cf8beac52f7eab0c97190f9b46d.zip
Qt-3ec5f0c801645cf8beac52f7eab0c97190f9b46d.tar.gz
Qt-3ec5f0c801645cf8beac52f7eab0c97190f9b46d.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Not possible to enter negative values to widgets with numeric fields
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_s60.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 2c70ade..3b5290c 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -726,6 +726,8 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints)
m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_EMAIL_ADDR_SPECIAL_CHARACTER_TABLE_DIALOG);
} else if (needsCharMap) {
m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_SPECIAL_CHARACTER_TABLE_DIALOG);
+ } else if ((hints & ImhFormattedNumbersOnly) || (hints & ImhDialableCharactersOnly)) {
+ m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_SPECIAL_CHARACTER_TABLE_DIALOG);
} else {
m_fepState->SetSpecialCharacterTableResourceId(0);
}