From: Alan Alpert <alan.alpert@nokia.com>
Date: Mon, 16 May 2011 01:59:36 +0000 (+1000)
Subject: Update QDeclarativeTextInput to match accessibility changes
X-Git-Tag: qt-v5.0.0-alpha1~2170^2~106
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2081a3d0fd7266ffba83849fee967e048e991270;p=profile%2Fivi%2Fqtdeclarative.git

Update QDeclarativeTextInput to match accessibility changes

Reviewed-by: Martin Jones
---

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 9a91769..785385b 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -1876,6 +1876,7 @@ bool QDeclarativeTextInput::isInputMethodComposing() const
 void QDeclarativeTextInputPrivate::init()
 {
     Q_Q(QDeclarativeTextInput);
+    control->setParent(q);//Now mandatory due to accessibility changes
     control->setCursorWidth(1);
     control->setPasswordCharacter(QLatin1Char('*'));
     q->setSmooth(smooth);
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
index f6f6bd8..07e3727 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
@@ -84,12 +84,10 @@ public:
             showInputPanelOnFocus = false;
         }
 #endif
-
     }
 
     ~QDeclarativeTextInputPrivate()
     {
-        delete control;
     }
 
     int xToPos(int x, QTextLine::CursorPosition betweenOrOn = QTextLine::CursorBetweenCharacters) const