diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-29 09:18:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-29 09:18:22 (GMT) |
| commit | ae16f6c59a009a508c1224b5dc02752ada0ce61a (patch) | |
| tree | 1fd24feef7e3cd4217a3792324b76276ecd9f24c /src/gui | |
| parent | 6940070adb45d67a0a9186205a4914a0a6c14135 (diff) | |
| parent | b7ea50145c6dc443e15d9f3f1e1dd1737a5135cc (diff) | |
| download | Qt-ae16f6c59a009a508c1224b5dc02752ada0ce61a.zip Qt-ae16f6c59a009a508c1224b5dc02752ada0ce61a.tar.gz Qt-ae16f6c59a009a508c1224b5dc02752ada0ce61a.tar.bz2 | |
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:
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index b368a82..98fc10f 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -808,13 +808,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(); } /*! |