diff options
author | Pierre Rossi <pierre.rossi@digia.com> | 2013-07-01 18:33:19 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-03 15:55:03 +0200 |
commit | 672354676d8e968e2523d1aeb450213a46b8b27c (patch) | |
tree | 3d92d372fc04e0c7998ecacccbd16e25a61d7fbb /src/quick/items/qquicktextedit_p_p.h | |
parent | 3c43b5783e914fd513620dc779afacaee71c495f (diff) |
QQuickTextEdit: move QSG* members from dptr to root node.
Subclass QSGTransform node for our use case and add the frame decorations
and cursor nodes in there.
Task-number: QTBUG-31580
Change-Id: Id2b468b53092f21134ae45e5694bc54c43660f8b
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/quick/items/qquicktextedit_p_p.h')
-rw-r--r-- | src/quick/items/qquicktextedit_p_p.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/quick/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h index 4f0ab939f6..11a0364b18 100644 --- a/src/quick/items/qquicktextedit_p_p.h +++ b/src/quick/items/qquicktextedit_p_p.h @@ -93,8 +93,7 @@ public: QQuickTextEditPrivate() : color(QRgb(0xFF000000)), selectionColor(QRgb(0xFF000080)), selectedTextColor(QRgb(0xFFFFFFFF)) , textMargin(0.0), xoff(0), yoff(0), font(sourceFont), cursorComponent(0), cursorItem(0), document(0), control(0) - , quickDocument(0), frameDecorationsNode(0), cursorNode(0) - , lastSelectionStart(0), lastSelectionEnd(0), lineCount(0) + , quickDocument(0), lastSelectionStart(0), lastSelectionEnd(0), lineCount(0) , hAlign(QQuickTextEdit::AlignLeft), vAlign(QQuickTextEdit::AlignTop) , format(QQuickTextEdit::PlainText), wrapMode(QQuickTextEdit::NoWrap) , renderType(QQuickTextEdit::QtRendering) @@ -155,8 +154,6 @@ public: QQuickTextControl *control; QQuickTextDocument *quickDocument; QList<Node*> textNodeMap; - QQuickTextNode *frameDecorationsNode; - QSGSimpleRectNode *cursorNode; int lastSelectionStart; int lastSelectionEnd; |