summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit_p_p.h')
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextedit_p_p.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
index 310db48..8d4b611 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
@@ -68,10 +68,11 @@ class QDeclarativeTextEditPrivate : public QDeclarativePaintedItemPrivate
public:
QDeclarativeTextEditPrivate()
- : color("black"), imgDirty(true), hAlign(QDeclarativeTextEdit::AlignLeft), vAlign(QDeclarativeTextEdit::AlignTop),
- dirty(false), wrap(false), richText(false), cursorVisible(false), focusOnPress(true),
+ : color("black"), hAlign(QDeclarativeTextEdit::AlignLeft), vAlign(QDeclarativeTextEdit::AlignTop),
+ imgDirty(true), dirty(false), richText(false), cursorVisible(false), focusOnPress(true),
persistentSelection(true), textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0),
- cursorComponent(0), cursor(0), format(QDeclarativeTextEdit::AutoText), document(0)
+ cursorComponent(0), cursor(0), format(QDeclarativeTextEdit::AutoText), document(0),
+ wrapMode(QDeclarativeTextEdit::NoWrap)
{
}
@@ -89,17 +90,16 @@ public:
QColor selectedTextColor;
QString style;
QColor styleColor;
- bool imgDirty;
QPixmap imgCache;
QPixmap imgStyleCache;
QDeclarativeTextEdit::HAlignment hAlign;
QDeclarativeTextEdit::VAlignment vAlign;
- bool dirty;
- bool wrap;
- bool richText;
- bool cursorVisible;
- bool focusOnPress;
- bool persistentSelection;
+ bool imgDirty : 1;
+ bool dirty : 1;
+ bool richText : 1;
+ bool cursorVisible : 1;
+ bool focusOnPress : 1;
+ bool persistentSelection : 1;
qreal textMargin;
int lastSelectionStart;
int lastSelectionEnd;
@@ -108,6 +108,7 @@ public:
QDeclarativeTextEdit::TextFormat format;
QTextDocument *document;
QTextControl *control;
+ QDeclarativeTextEdit::WrapMode wrapMode;
};
QT_END_NAMESPACE