summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@digia.com>2013-11-19 11:52:18 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-21 15:25:33 +0100
commit55a4db4f47013662970144bb0657e1686186ce05 (patch)
tree7f74386c24d803073a32dfd97307c9fed8cc336b /src/widgets
parent52fc0a95a109d2e9fa279eeb0284a8178563080b (diff)
Report input method hints for QGraphicsTextItem
Task-number: QTBUG-34893 Change-Id: Iabf3b8be4896dadf07e4440f2cffc40aede4a85b Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/graphicsview/qgraphicsitem.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index 7cab132a2e..a4adb3d20b 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -10307,7 +10307,9 @@ void QGraphicsTextItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
QVariant QGraphicsTextItem::inputMethodQuery(Qt::InputMethodQuery query) const
{
QVariant v;
- if (dd->control)
+ if (query == Qt::ImHints)
+ v = int(inputMethodHints());
+ else if (dd->control)
v = dd->control->inputMethodQuery(query);
if (v.type() == QVariant::RectF)
v = v.toRectF().translated(-dd->controlOffset());