diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-05-27 12:06:20 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-05-27 12:06:20 +1000 |
| commit | b52ed81c68866e9792a1db46413c74a3f8d2be03 (patch) | |
| tree | 4cc95097c7d7aa380717e8d3d124f2052cb3f86d /src/declarative/items/qsgtextinput_p_p.h | |
| parent | b10d450e9ea99aa1ad28ff5d939958503f0bd5ea (diff) | |
Revert "Make QSGTextNode back-end for QML's TextInput"
This reverts commit e430f1336881850a73a54a291e0276160d568212.
Diffstat (limited to 'src/declarative/items/qsgtextinput_p_p.h')
| -rw-r--r-- | src/declarative/items/qsgtextinput_p_p.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/declarative/items/qsgtextinput_p_p.h b/src/declarative/items/qsgtextinput_p_p.h index 6f69be5d69..6561d28a31 100644 --- a/src/declarative/items/qsgtextinput_p_p.h +++ b/src/declarative/items/qsgtextinput_p_p.h @@ -65,9 +65,7 @@ QT_BEGIN_NAMESPACE -class QSGTextNode; - -class Q_AUTOTEST_EXPORT QSGTextInputPrivate : public QSGImplicitSizeItemPrivate +class Q_AUTOTEST_EXPORT QSGTextInputPrivate : public QSGImplicitSizePaintedItemPrivate { Q_DECLARE_PUBLIC(QSGTextInput) public: @@ -78,7 +76,7 @@ public: hscroll(0), oldScroll(0), oldValidity(false), focused(false), focusOnPress(true), showInputPanelOnFocus(true), clickCausedFocus(false), cursorVisible(false), autoScroll(true), selectByMouse(false), canPaste(false), hAlignImplicit(true), - selectPressed(false), textNode(0) + selectPressed(false) { #ifdef Q_OS_SYMBIAN if (QSysInfo::symbianVersion() == QSysInfo::SV_SF_1 || QSysInfo::symbianVersion() == QSysInfo::SV_SF_3) { @@ -108,8 +106,6 @@ public: int calculateTextWidth(); bool sendMouseEventToInputContext(QGraphicsSceneMouseEvent *event, QEvent::Type eventType); void updateInputMethodHints(); - void hideCursor(); - void showCursor(); QLineControl* control; @@ -126,7 +122,6 @@ public: QPointer<QDeclarativeComponent> cursorComponent; QPointer<QSGItem> cursorItem; QPointF pressPos; - QSGTextNode *textNode; int lastSelectionStart; int lastSelectionEnd; |