diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:15:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-24 17:15:53 +0000 |
| commit | 30405c50a521146f2dda49916f160ab722316a82 (patch) | |
| tree | f7daaa3565d523932685716dd9b9fa16728fa534 /src/declarative/graphicsitems/qdeclarativetextedit_p_p.h | |
| parent | ad3874ec96c50ec23eeeddda6b5758beda5c9c3d (diff) | |
| parent | bfbcec26eb6f9423ee27d75ae5abcd70cd255390 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5v5.5.0-alpha1
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit_p_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h index 59ed5d41..16659082 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h @@ -66,7 +66,7 @@ public: hAlignImplicit(true), rightToLeftText(false), selectByMouse(false), canPaste(false), canPasteValid(false), textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0), cursorComponent(0), cursor(0), format(QDeclarativeTextEdit::AutoText), document(0), wrapMode(QDeclarativeTextEdit::NoWrap), - mouseSelectionMode(QDeclarativeTextEdit::SelectCharacters), + mouseSelectionMode(QDeclarativeTextEdit::SelectCharacters), lineCount(0), yoff(0) { } |