From 2257e544e1968ab63b03479659ae3a5ffa6c6a5b Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Tue, 17 May 2011 09:17:36 +1000 Subject: [PATCH] Apply 2081a3d0fd7266ffba83849fee967e048e991270 to SG TextInput --- src/declarative/items/qsgtextinput.cpp | 1 + src/declarative/items/qsgtextinput_p_p.h | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/declarative/items/qsgtextinput.cpp b/src/declarative/items/qsgtextinput.cpp index 4eab28b..1db4474 100644 --- a/src/declarative/items/qsgtextinput.cpp +++ b/src/declarative/items/qsgtextinput.cpp @@ -1150,6 +1150,7 @@ bool QSGTextInput::isInputMethodComposing() const void QSGTextInputPrivate::init() { Q_Q(QSGTextInput); + control->setParent(q);//Now mandatory due to accessibility changes control->setCursorWidth(1); control->setPasswordCharacter(QLatin1Char('*')); q->setSmooth(smooth); diff --git a/src/declarative/items/qsgtextinput_p_p.h b/src/declarative/items/qsgtextinput_p_p.h index 22c95a7..6561d28 100644 --- a/src/declarative/items/qsgtextinput_p_p.h +++ b/src/declarative/items/qsgtextinput_p_p.h @@ -83,12 +83,10 @@ public: showInputPanelOnFocus = false; } #endif - } ~QSGTextInputPrivate() { - delete control; } int xToPos(int x, QTextLine::CursorPosition betweenOrOn = QTextLine::CursorBetweenCharacters) const -- 1.7.2.5