diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-05-16 11:59:36 +1000 |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2011-05-16 13:15:38 +1000 |
| commit | 2081a3d0fd7266ffba83849fee967e048e991270 (patch) | |
| tree | 0eb895f2c3dba50d58fdaa9670182832c6dc990f | |
| parent | 68d18d77ebac49c2b863c425969c70c5426864cd (diff) | |
Update QDeclarativeTextInput to match accessibility changes
Reviewed-by: Martin Jones
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 1 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput_p_p.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 9a917690f1..785385bcf2 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 f6f6bd8ca4..07e37277b7 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 |