From ad22c0c7cff332a77ea527c21e39490c8917b68e Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Mon, 2 Jan 2012 16:21:48 +0200 Subject: [PATCH] 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 Reviewed-by: Lars Knoll --- src/corelib/global/qnamespace.h | 1 - src/corelib/global/qnamespace.qdoc | 1 - src/widgets/widgets/qtextedit.cpp | 1 - 3 files changed, 3 deletions(-) diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 0aa3f3c..64c4541 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 267c25d..a733241 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 c0a91e9..acd663e 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); -- 2.7.4