1 files changed, 130 insertions, 3 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index a436805..d9cba2a 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -568,6 +568,7 @@
 #include <QtGui/qpixmapcache.h>
 #include <QtGui/qstyleoption.h>
 #include <QtGui/qevent.h>
+#include <QInputContext>
 
 #include <private/qgraphicsitem_p.h>
 #include <private/qgraphicswidget_p.h>
@@ -3324,7 +3325,7 @@ QTransform QGraphicsItem::itemTransform(const QGraphicsItem *other, bool *ok) co
     QTransform x;
     const QGraphicsItem *p = child;
     do {
-        p->d_ptr->combineTransformToParent(&x);
+        p->d_ptr->.data()->combineTransformToParent(&x);
     } while ((p = p->d_ptr->parent) && p != root);
     if (parentOfOther)
         return x.inverted(ok);
@@ -3682,7 +3683,7 @@ QRectF QGraphicsItem::sceneBoundingRect() const
     const QGraphicsItem *parentItem = this;
     const QGraphicsItemPrivate *itemd;
     do {
-        itemd = parentItem->d_ptr;
+        itemd = parentItem->d_ptr.data();
         if (itemd->transformData)
             break;
         offset += itemd->pos;
@@ -8391,7 +8392,7 @@ class QGraphicsTextItemPrivate
 {
 public:
     QGraphicsTextItemPrivate()
-        : control(0), pageNumber(0), useDefaultImpl(false), tabChangesFocus(false)
+        : control(0), pageNumber(0), useDefaultImpl(false), tabChangesFocus(false), clickCausedFocus(0)
     { }
 
     mutable QTextControl *control;
@@ -8412,6 +8413,8 @@ public:
     bool useDefaultImpl;
     bool tabChangesFocus;
 
+    uint clickCausedFocus : 1;
+
     QGraphicsTextItem *qq;
 };
 
@@ -8741,7 +8744,13 @@ void QGraphicsTextItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             dd->useDefaultImpl = false;
         return;
     }
+
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -8753,7 +8762,13 @@ void QGraphicsTextItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
         QGraphicsItem::mouseMoveEvent(event);
         return;
     }
+
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -8773,7 +8788,23 @@ void QGraphicsTextItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
         }
         return;
     }
+
+    if (event->button() == Qt::LeftButton && qApp->autoSipEnabled()
+            && (!dd->clickCausedFocus || qApp->autoSipOnMouseFocus())) {
+        QEvent _event(QEvent::RequestSoftwareInputPanel);
+        QApplication::sendEvent(event->widget(), &_event);
+    } else {
+        QGraphicsItem::mouseReleaseEvent(event);
+    }
+    dd->clickCausedFocus = 0;
+
     dd->sendControlEvent(event);
+
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -8792,6 +8823,11 @@ void QGraphicsTextItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
     }
 
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -8800,6 +8836,11 @@ void QGraphicsTextItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 void QGraphicsTextItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -8808,6 +8849,18 @@ void QGraphicsTextItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 void QGraphicsTextItem::keyPressEvent(QKeyEvent *event)
 {
     dd->sendControlEvent(event);
+    QList<QGraphicsView *> views = scene()->views();
+    for (int i = 0; i < views.size(); ++i) {
+        QGraphicsView *view = views.at(i);
+        Q_ASSERT(view->viewport());
+        if(view->viewport()->hasFocus()) {
+            QInputContext *qic = view->viewport()->inputContext();
+            if(qic){
+               qic->update();
+            }
+            break;
+        }
+    }
 }
 
 /*!
@@ -8816,6 +8869,18 @@ void QGraphicsTextItem::keyPressEvent(QKeyEvent *event)
 void QGraphicsTextItem::keyReleaseEvent(QKeyEvent *event)
 {
     dd->sendControlEvent(event);
+    QList<QGraphicsView *> views = scene()->views();
+    for (int i = 0; i < views.size(); ++i) {
+        QGraphicsView *view = views.at(i);
+        Q_ASSERT(view->viewport());
+        if(view->viewport()->hasFocus()) {
+            QInputContext *qic = view->viewport()->inputContext();
+            if(qic){
+               qic->update();
+            }
+            break;
+        }
+    }
 }
 
 /*!
@@ -8824,7 +8889,22 @@ void QGraphicsTextItem::keyReleaseEvent(QKeyEvent *event)
 void QGraphicsTextItem::focusInEvent(QFocusEvent *event)
 {
     dd->sendControlEvent(event);
+    if (event->reason() == Qt::MouseFocusReason) {
+        dd->clickCausedFocus = 1;
+    }
     update();
+    QList<QGraphicsView *> views = scene()->views();
+    for (int i = 0; i < views.size(); ++i) {
+        QGraphicsView *view = views.at(i);
+        Q_ASSERT(view->viewport());
+        if(view->viewport()->hasFocus()) {
+            QInputContext *qic = view->viewport()->inputContext();
+            if(qic){
+               qic->reset();
+            }
+            break;
+        }
+    }
 }
 
 /*!
@@ -8834,6 +8914,18 @@ void QGraphicsTextItem::focusOutEvent(QFocusEvent *event)
 {
     dd->sendControlEvent(event);
     update();
+    QList<QGraphicsView *> views = scene()->views();
+    for (int i = 0; i < views.size(); ++i) {
+        QGraphicsView *view = views.at(i);
+        Q_ASSERT(view->viewport());
+        if(view->viewport()->hasFocus()) {
+            QInputContext *qic = view->viewport()->inputContext();
+            if(qic){
+               qic->reset();
+            }
+            break;
+        }
+    }
 }
 
 /*!
@@ -8842,6 +8934,11 @@ void QGraphicsTextItem::focusOutEvent(QFocusEvent *event)
 void QGraphicsTextItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -8850,6 +8947,11 @@ void QGraphicsTextItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
 void QGraphicsTextItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -8858,6 +8960,11 @@ void QGraphicsTextItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
 void QGraphicsTextItem::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -8866,6 +8973,11 @@ void QGraphicsTextItem::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
 void QGraphicsTextItem::dropEvent(QGraphicsSceneDragDropEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -8882,6 +8994,11 @@ void QGraphicsTextItem::inputMethodEvent(QInputMethodEvent *event)
 void QGraphicsTextItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -8890,6 +9007,11 @@ void QGraphicsTextItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 void QGraphicsTextItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!
@@ -8898,6 +9020,11 @@ void QGraphicsTextItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
 void QGraphicsTextItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
     dd->sendControlEvent(event);
+    Q_ASSERT(event->widget());
+    QInputContext *qic = event->widget()->inputContext();
+    if(qic) {
+        qic->update();
+    }
 }
 
 /*!