diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2012-02-15 11:06:30 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-15 03:14:37 +0100 |
| commit | 6a62d2b5a9cda4ba5e56fa4fa340a2b0a957bcc0 (patch) | |
| tree | 51fe83259f829d579539aae6efcc96e0fded9314 /src/quick/items/qquicktextedit_p_p.h | |
| parent | 0ae106b5d9b23ed35a27ee409827dd623a4a1b50 (diff) | |
Remove pixmap text caching in TextEdit element
Task-number: QTBUG-24278
Change-Id: Ida9014aceba93c023c88538969dff7e72ef5a6d8
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextedit_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktextedit_p_p.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/quick/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h index ead74a282f..665aa02839 100644 --- a/src/quick/items/qquicktextedit_p_p.h +++ b/src/quick/items/qquicktextedit_p_p.h @@ -58,7 +58,6 @@ #include "qquickimplicitsizeitem_p_p.h" #include <QtDeclarative/qdeclarative.h> -#include <QtGui/qpixmap.h> QT_BEGIN_NAMESPACE class QTextLayout; @@ -73,12 +72,12 @@ public: : color("black"), hAlign(QQuickTextEdit::AlignLeft), vAlign(QQuickTextEdit::AlignTop), documentDirty(true), dirty(false), richText(false), cursorVisible(false), focusOnPress(true), persistentSelection(false), requireImplicitWidth(false), selectByMouse(false), canPaste(false), - canPasteValid(false), hAlignImplicit(true), rightToLeftText(false), useImageFallback(false), + canPasteValid(false), hAlignImplicit(true), rightToLeftText(false), textCached(false), textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0), cursorComponent(0), cursor(0), format(QQuickTextEdit::PlainText), document(0), wrapMode(QQuickTextEdit::NoWrap), mouseSelectionMode(QQuickTextEdit::SelectCharacters), - lineCount(0), yoff(0), nodeType(NodeIsNull), texture(0), updateType(UpdatePaintNode) + lineCount(0), yoff(0), updateType(UpdatePaintNode) { } @@ -118,7 +117,6 @@ public: bool canPasteValid:1; bool hAlignImplicit:1; bool rightToLeftText:1; - bool useImageFallback:1; bool textCached:1; qreal textMargin; @@ -135,15 +133,6 @@ public: int yoff; QSize contentSize; - enum NodeType { - NodeIsNull, - NodeIsTexture, - NodeIsText - }; - NodeType nodeType; - QSGTexture *texture; - QPixmap pixmapCache; - enum UpdateType { UpdateNone, UpdateOnlyPreprocess, |