diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-01-02 16:21:48 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-05 11:40:08 +0100 |
| commit | ad22c0c7cff332a77ea527c21e39490c8917b68e (patch) | |
| tree | 6fc84bd082f0c5880c8154996e06b9f7967b5675 | |
| parent | 55a0b33994ff7b292055065065a5cc2fd13b3a55 (diff) | |
Removed Qt::ImhMultiLine
Multi line information does not really work that well as
input method hint. Application developer is the one setting
value for the hint, and thus would be responsible for
always having right value for multi line.
Change-Id: I6102be95549f6f6d4da40845f52d5c873cd46a47
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| -rw-r--r-- | src/corelib/global/qnamespace.h | 1 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 1 | ||||
| -rw-r--r-- | src/widgets/widgets/qtextedit.cpp | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 0aa3f3c632..64c4541798 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1297,7 +1297,6 @@ public: ImhDate = 0x80, ImhTime = 0x100, - ImhMultiLine = 0x200, ImhDigitsOnly = 0x10000, ImhFormattedNumbersOnly = 0x20000, diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 267c25deb3..a7332417ae 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2429,7 +2429,6 @@ \value ImhDate The text editor functions as a date field. \value ImhTime The text editor functions as a time field. - \value ImhMultiLine The text editor accepts multi-line content. Flags that restrict input (exclusive flags): diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index c0a91e9bcd..acd663eb8c 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -179,7 +179,6 @@ void QTextEditPrivate::init(const QString &html) q->setFocusPolicy(Qt::WheelFocus); q->setAttribute(Qt::WA_KeyCompression); q->setAttribute(Qt::WA_InputMethodEnabled); - q->setInputMethodHints(Qt::ImhMultiLine); #ifndef QT_NO_CURSOR viewport->setCursor(Qt::IBeamCursor); |