diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-08-06 00:45:39 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-08-06 00:45:39 (GMT) |
| commit | e7a19af4430b45f371bb33120f0ed39a2c83b733 (patch) | |
| tree | c0751ed9a7d0bc77e191db54e8584c9f5814e717 /src/gui/graphicsview/qgraphicsscene.cpp | |
| parent | 262bdce40f7bb38f000eff09ed546a08cfe74fa3 (diff) | |
| parent | 719e22c7fd34112460cddecb1491c3575c5a8c86 (diff) | |
| download | Qt-e7a19af4430b45f371bb33120f0ed39a2c83b733.zip Qt-e7a19af4430b45f371bb33120f0ed39a2c83b733.tar.gz Qt-e7a19af4430b45f371bb33120f0ed39a2c83b733.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src/gui/graphicsview/qgraphicsscene.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 48a0093..a98ce6f 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -831,6 +831,11 @@ void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item, #endif //QT_NO_IM } + // This handles the case that the item has been removed from the + // scene in response to the FocusOut event. + if (item && item->scene() != q) + item = 0; + if (item) focusItem = item; updateInputMethodSensitivityInViews(); |