diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:53:39 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:53:39 +0100 |
commit | bfbcec26eb6f9423ee27d75ae5abcd70cd255390 (patch) | |
tree | 5845eda8e07adef5dbf27d56107e5330ea5d3fbf /src/declarative/graphicsitems | |
parent | 4b4c6a984b2bcdfcb5a77a024e48072a7aa854ec (diff) | |
parent | 41119e843f099ce7d80f966cc754324bfe0f063f (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
Change-Id: I85eac7ffdbd673aeba4e7437fa5a9dc50759a736
Diffstat (limited to 'src/declarative/graphicsitems')
-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 e9f2b17e..b334fae0 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) { } |