Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  Fix bold text rendering of Thai and Vietnamese on Symbian
  Event dispatcher slow down using delays rather than thread priority
  Fixed incorrect runtime platform version check in Phonon MMF backend
  Removing unused code.
  Support 'Text' mode in Symbian specific input methods
  Map Symbian touch points to the screen's coordinate system.
  Revert "Event dispatcher slow down using delays rather than thread priority"
  Fixed a leak in QTextDocument::print().
  Fix crash in QDBusInterface when invoking a method in a derived class.
  tst_selftest: Fix off-by-one error in cleaning up line numbers and filenames
  Fix long menu item texts causing crash
  Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index bd0f0d8..8cee021 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -820,13 +820,13 @@ void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item,
 #endif //QT_NO_IM
     }
 
-    if (item) {
+    if (item)
         focusItem = item;
+    updateInputMethodSensitivityInViews();
+    if (item) {
         QFocusEvent event(QEvent::FocusIn, focusReason);
         sendEvent(item, &event);
     }
-
-    updateInputMethodSensitivityInViews();
 }
 
 /*!