diff options
author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-06-01 04:50:59 (GMT) |
---|---|---|
committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-06-02 01:43:45 (GMT) |
commit | e891abddfe42699a8c2c9a583b91269237e17008 (patch) | |
tree | a35d24cba102549a7e5c9ad2ff4a1608e84fc84a /src/declarative/graphicsitems/qdeclarativetextedit_p_p.h | |
parent | 850efd1651acbec1f99fc3b7f35307a88504327b (diff) | |
download | Qt-e891abddfe42699a8c2c9a583b91269237e17008.zip Qt-e891abddfe42699a8c2c9a583b91269237e17008.tar.gz Qt-e891abddfe42699a8c2c9a583b91269237e17008.tar.bz2 |
Take into account platform differences in input panel support
Task-number:
Reviewed-by: Warwick Allison
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit_p_p.h')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit_p_p.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h index 8e1d630..4092e65 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h @@ -70,12 +70,17 @@ public: QDeclarativeTextEditPrivate() : color("black"), hAlign(QDeclarativeTextEdit::AlignLeft), vAlign(QDeclarativeTextEdit::AlignTop), imgDirty(true), dirty(false), richText(false), cursorVisible(false), focusOnPress(true), - showInputPanelOnFocus(true), persistentSelection(true), textMargin(0.0), lastSelectionStart(0), - lastSelectionEnd(0), cursorComponent(0), cursor(0), format(QDeclarativeTextEdit::AutoText), - document(0), wrapMode(QDeclarativeTextEdit::NoWrap), + showInputPanelOnFocus(true), clickCausedFocus(false), persistentSelection(true), textMargin(0.0), + lastSelectionStart(0), lastSelectionEnd(0), cursorComponent(0), cursor(0), + format(QDeclarativeTextEdit::AutoText), document(0), wrapMode(QDeclarativeTextEdit::NoWrap), selectByMouse(false), yoff(0) { +#ifdef Q_OS_SYMBIAN + if (QSysInfo::symbianVersion() == QSysInfo::SV_SF_1 || QSysInfo::symbianVersion() == QSysInfo::SV_SF_3) { + showInputPanelOnFocus = false; + } +#endif } void init(); @@ -102,6 +107,7 @@ public: bool cursorVisible : 1; bool focusOnPress : 1; bool showInputPanelOnFocus : 1; + bool clickCausedFocus : 1; bool persistentSelection : 1; qreal textMargin; int lastSelectionStart; |