summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/src/qnamespace.qdoc7
-rw-r--r--src/gui/kernel/qwidget.cpp2
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc
index 346c425..84b3a01 100644
--- a/doc/src/qnamespace.qdoc
+++ b/doc/src/qnamespace.qdoc
@@ -2402,9 +2402,10 @@
\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.
+ at the beginning of a sentence.
\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
+ phone numbers, or all numbers, depending on which one of the
+ \c ImhDigitsOnly, \c ImhDialableCharactersOnly 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).
@@ -2415,6 +2416,8 @@
consist of the union of the specified sets. For instance specifying \c ImhNumbersOnly and
\c ImhUppercaseOnly would yield a set consisting of numbers and uppercase letters.
+ \note If several flags of the \c Prefer type are ORed together, the result is undefined.
+
\sa QWidget::inputMethodHints
*/
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 19fdfbf..b28a95e 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -8487,6 +8487,8 @@ QVariant QWidget::inputMethodQuery(Qt::InputMethodQuery query) const
sure that a certain type of characters are entered,
you should also set a QValidator on the widget.
+ The default value is Qt::ImhNone.
+
\since 4.6
\sa inputMethodQuery(), QInputContext