diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-01 03:37:33 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-01 03:37:33 (GMT) |
| commit | 2e0eae3e7f5c72bba7aee43366618edf2cfc4b06 (patch) | |
| tree | 382eae34920ab090343507850d18a62e4422cdc8 /src/declarative | |
| parent | e291a894d882afeca62bd16cd6e1703fc94e0ed6 (diff) | |
| parent | a1c89f8045fa57617312fac33c1c223965a791c5 (diff) | |
| download | Qt-2e0eae3e7f5c72bba7aee43366618edf2cfc4b06.zip Qt-2e0eae3e7f5c72bba7aee43366618edf2cfc4b06.tar.gz Qt-2e0eae3e7f5c72bba7aee43366618edf2cfc4b06.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
| -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 5f5269f..3521638 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) { |