diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-17 13:22:03 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-17 13:22:03 (GMT) |
| commit | faf6d0de6e3b8168fbd6f04c5380f47d350e2a22 (patch) | |
| tree | d3c35778ad9c7abe68b681b39dd004027fd50880 /src/gui/graphicsview | |
| parent | 3a92f40e1faf4d81f5071a66558b051a9fda727e (diff) | |
| parent | 499a9aaabad0756cbca7b39751684308a6ba88ea (diff) | |
| download | Qt-faf6d0de6e3b8168fbd6f04c5380f47d350e2a22.zip Qt-faf6d0de6e3b8168fbd6f04c5380f47d350e2a22.tar.gz Qt-faf6d0de6e3b8168fbd6f04c5380f47d350e2a22.tar.bz2 | |
Merge remote branch 'staging/4.6' into 4.6
Diffstat (limited to 'src/gui/graphicsview')
| -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); } |