Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (23 commits)
  Implement QDirectFBPixmapData::scroll
  Potential crash when adding items from QGraphicsWidget::polishEvent().
  QGraphicsWidget is painted twice on the inital show.
  Fix QPainter::redirection() to pass autotest.
  Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.
  revert parts of 10392eef4fd4f9
  Fix y-inverted pixmaps properly.
  Fix rendering with simple shader in GL2 engine
  removed a debug trace
  Fix documentation bug in QColor
  Don't use a mutex lock in QPainter::redirection unless strictly required
  Only send QGraphicsItem::ParentChange(d) notifications from setParentItem.
  Pass value as const void *const to QGraphicsSceneIndex::itemChange.
  Optimize QGraphicsItem::setFlags.
  Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helper
  Improve performance of QGraphicsItem::setParentItem.
  Make sure cursor is painted at the correct position when we are using IM.
  Purely cosmetic (formatting) changes to GL2 engine's GLSL
  Use an attribute value for the PMV matrix rather than a uniform
  Remove unnecessary depth uniform from GL2 engine's GLSL
  ...

1 files changed, 4 insertions, 1 deletions

diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index 414c2ed..b0a64ea 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -524,8 +524,11 @@ void QLineControl::draw(QPainter *painter, const QPoint &offset, const QRect &cl
         m_textLayout.draw(painter, offset, selections, clip);
 
     if (flags & DrawCursor){
+        int cursor = m_cursor;
+        if (m_preeditCursor != -1)
+            cursor += m_preeditCursor;
         if(!m_blinkPeriod || m_blinkStatus)
-            m_textLayout.drawCursor(painter, offset, m_cursor, m_cursorWidth);
+            m_textLayout.drawCursor(painter, offset, cursor, m_cursorWidth);
     }
 }