diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-04 15:32:50 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-04 15:32:51 +0200 |
| commit | 81077291e3ae1fe8819cf58471ee09ad66c9cad1 (patch) | |
| tree | c0e7a482affcdfa38ee9a2ec305d02b543ad25d8 /src/quick/items/qquicktextedit_p_p.h | |
| parent | ea045d82a3a837f83fec82462feebf2bc262f9d9 (diff) | |
| parent | 9422bb302882bfe9e3123d8f1542507c6b6577f4 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I15cb7460171b38d11d66367aeb0831ec6e3ca933
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 ec3cf1cec5..331e5bb13f 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) @@ -156,8 +155,6 @@ public: QQuickTextControl *control; QQuickTextDocument *quickDocument; QList<Node*> textNodeMap; - QQuickTextNode *frameDecorationsNode; - QSGSimpleRectNode *cursorNode; int lastSelectionStart; int lastSelectionEnd; |