Merge branch 'virtualKeyboardAPI' into imHintsForS60

3 files changed, 27 insertions, 14 deletions

diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc
index 5ffae83..346c425 100644
--- a/doc/src/qnamespace.qdoc
+++ b/doc/src/qnamespace.qdoc
@@ -2397,12 +2397,15 @@
     \value ImhNone                   No hints.
     \value ImhHiddenText             Characters should be hidden, as is typically used when entering passwords.
                                      This is automatically set when setting QLineEdit::echoMode to \c Password.
-    \value ImhNumbersOnly            Only number input is allowed.
+    \value ImhDigitsOnly             Only digit input is allowed.
+    \value ImhFormattedNumbersOnly   Only number input (including integers and real numbers) is allowed.
     \value ImhUppercaseOnly          Only upper case letter input is allowed.
     \value ImhLowercaseOnly          Only lower case letter input is allowed.
     \value ImhNoAutoUppercase        The input method should not try to automatically switch to upper case
                                      when a sentence ends.
-    \value ImhPreferNumbers          Numbers are preferred (but not required).
+    \value ImhPreferNumbers          Numbers are preferred (but not required). This can include only digits,
+                                     or all numbers, depending on which one of the \c ImhDigitsOnly and
+                                     \c ImhFormattedNumbersOnly flags is given.
     \value ImhPreferUppercase        Upper case letters are preferred (but not required).
     \value ImhPreferLowercase        Lower case letters are preferred (but not required).
     \value ImhNoPredictiveText       Do not use predictive text (i.e. dictionary lookup) while typing.
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 1475b2e..e0ca27c 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1401,15 +1401,16 @@ public:
     enum InputMethodHint {
         ImhNone = 0x0,
         ImhHiddenText = 0x1,
-        ImhNumbersOnly = 0x2,
-        ImhUppercaseOnly = 0x4,
-        ImhLowercaseOnly = 0x8,
-        ImhNoAutoUppercase = 0x10,
-        ImhPreferNumbers = 0x20,
-        ImhPreferUppercase = 0x40,
-        ImhPreferLowercase = 0x80,
-        ImhNoPredictiveText = 0x100,
-        ImhDialableCharactersOnly = 0x200
+        ImhDigitsOnly = 0x2,
+        ImhFormattedNumbersOnly = 0x4,
+        ImhUppercaseOnly = 0x8,
+        ImhLowercaseOnly = 0x10,
+        ImhNoAutoUppercase = 0x20,
+        ImhPreferNumbers = 0x40,
+        ImhPreferUppercase = 0x80,
+        ImhPreferLowercase = 0x100,
+        ImhNoPredictiveText = 0x200,
+        ImhDialableCharactersOnly = 0x400
     };
     Q_DECLARE_FLAGS(InputMethodHints, InputMethodHint)
 
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 64aeab5..19fdfbf 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -8478,11 +8478,14 @@ QVariant QWidget::inputMethodQuery(Qt::InputMethodQuery query) const
 
     This is only relevant for input widgets. It is used by
     the input method to retrieve hints as to how the input method
-    should operate. For example, if the Qt::ImhNumbersOnly flag is
-    set, the input method may change its visual components to reflect
+    should operate. For example, if the Qt::ImhFormattedNumbersOnly flag
+    is set, the input method may change its visual components to reflect
     that only numbers can be entered.
 
-    The effect may vary between input method implementations.
+    \note The flags are only hints, so the particular input method
+          implementation is free to ignore them. If you want to be
+          sure that a certain type of characters are entered,
+          you should also set a QValidator on the widget.
 
     \since 4.6
 
@@ -8498,6 +8501,12 @@ void QWidget::setInputMethodHints(Qt::InputMethodHints hints)
 {
     Q_D(QWidget);
     d->imHints = hints;
+    // Optimisation to update input context only it has already been created.
+    if (d->ic || qApp->d_func()->inputContext) {
+        QInputContext *ic = inputContext();
+        if (ic)
+            ic->update();
+    }
 }