diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-12-01 05:59:34 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-12-01 05:59:34 (GMT) |
| commit | 4b6c67881431cf34eee30319b81bad2030b94ff5 (patch) | |
| tree | 53a90124c8f13dac12eacb2f48105eec585115ba /src | |
| parent | c25dba4228d958ccddeee22811cec7e40e1ccfc3 (diff) | |
| parent | f36455bc3b559261c73b4f6269591a2eda8d0baa (diff) | |
| download | Qt-4b6c67881431cf34eee30319b81bad2030b94ff5.zip Qt-4b6c67881431cf34eee30319b81bad2030b94ff5.tar.gz Qt-4b6c67881431cf34eee30319b81bad2030b94ff5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicstextedit.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp index 94c4a1e..4fed035 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp +++ b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp @@ -562,7 +562,7 @@ QString QmlGraphicsTextEdit::selectedText() const \qmlproperty bool TextEdit::focusOnPress Whether the TextEdit should gain focus on a mouse press. By default this is - set to false. + set to true. */ bool QmlGraphicsTextEdit::focusOnPress() const { diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h index 4cbc56d..6541921 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h @@ -69,7 +69,7 @@ class QmlGraphicsTextEditPrivate : public QmlGraphicsPaintedItemPrivate public: QmlGraphicsTextEditPrivate() : color("black"), imgDirty(true), hAlign(QmlGraphicsTextEdit::AlignLeft), vAlign(QmlGraphicsTextEdit::AlignTop), - dirty(false), wrap(false), richText(false), cursorVisible(false), focusOnPress(false), + dirty(false), wrap(false), richText(false), cursorVisible(false), focusOnPress(true), persistentSelection(true), textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0), cursorComponent(0), cursor(0), format(QmlGraphicsTextEdit::AutoText), document(0) { |