diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-11 14:12:42 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-13 15:58:43 (GMT) |
| commit | ead0ab9e14603f278fcaaf4f126cdd232274fe26 (patch) | |
| tree | a90570d944ea37b75b558d999d70a466b9c20cae /src/gui | |
| parent | 7ddfd25fd8642c0b61e3cfbc4408c2ce4a664fc1 (diff) | |
| download | Qt-ead0ab9e14603f278fcaaf4f126cdd232274fe26.zip Qt-ead0ab9e14603f278fcaaf4f126cdd232274fe26.tar.gz Qt-ead0ab9e14603f278fcaaf4f126cdd232274fe26.tar.bz2 | |
Fix S60 input method not showing up in editable QGraphicsTextItems
Correctly set the ItemAcceptsInputMethod flag in setTextInteractionFlags.
Reviewed-by: Andreas
Reviewed-by: axis
Reviewed-by: Janne Koskinen
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 4e5e5c8..3f6dff2 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -10178,9 +10178,10 @@ bool QGraphicsTextItemPrivate::_q_mouseOnEdge(QGraphicsSceneMouseEvent *event) void QGraphicsTextItem::setTextInteractionFlags(Qt::TextInteractionFlags flags) { if (flags == Qt::NoTextInteraction) - setFlags(this->flags() & ~QGraphicsItem::ItemIsFocusable); + setFlags(this->flags() & ~(QGraphicsItem::ItemIsFocusable | QGraphicsItem::ItemAcceptsInputMethod)); else - setFlags(this->flags() | QGraphicsItem::ItemIsFocusable); + setFlags(this->flags() | QGraphicsItem::ItemIsFocusable | QGraphicsItem::ItemAcceptsInputMethod); + dd->textControl()->setTextInteractionFlags(flags); } |