From 9b571bd1c6a00e157aa4375c6598179c7fba7e54 Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Date: Mon, 2 Jan 2012 16:11:03 +0200
Subject: [PATCH] Remove use of Qt::ImhMultiLine, to be deprecated/removed

Change-Id: I02a1611c945bf3804081bb9d0cd8da470a5774d8
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
---
 src/quick/items/qquickitem.cpp      | 2 +-
 src/quick/items/qquicktextinput.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 54ce3162f7..a6cff52c6b 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -2290,7 +2290,7 @@ QQuickItemPrivate::QQuickItemPrivate()
   z(0), scale(1), rotation(0), opacity(1),
 
   attachedLayoutDirection(0), acceptedMouseButtons(0),
-  imHints(Qt::ImhMultiLine),
+  imHints(Qt::ImhNone),
 
   keyHandler(0),
 
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index e6da163c83..e514c38b79 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -2050,7 +2050,6 @@ void QQuickTextInputPrivate::init()
             q, SLOT(q_canPasteChanged()));
 #endif // QT_NO_CLIPBOARD
 
-    imHints &= ~Qt::ImhMultiLine;
     oldValidity = hasAcceptableInput(m_text);
     lastSelectionStart = 0;
     lastSelectionEnd = 0;