diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-06 12:26:51 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-06 12:26:51 (GMT) |
| commit | 612a7680e10eb434cd6e09a2165ab1b75efdb72a (patch) | |
| tree | c0deb1de9b52f466a1d4128094652d8b5e983038 /src/gui/graphicsview/qgraphicsitem.cpp | |
| parent | 94cae67da50d68f70d728a7fb231de89d47263db (diff) | |
| parent | f6d9c3f0dd014c409c43150b3a10866f47ea54a6 (diff) | |
| download | Qt-612a7680e10eb434cd6e09a2165ab1b75efdb72a.zip Qt-612a7680e10eb434cd6e09a2165ab1b75efdb72a.tar.gz Qt-612a7680e10eb434cd6e09a2165ab1b75efdb72a.tar.bz2 | |
Merge commit 'origin/4.7' into mimir
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 3b18c31..fc44a44 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -6655,6 +6655,11 @@ bool QGraphicsItem::sceneEvent(QEvent *event) return true; } + if (event->type() == QEvent::FocusOut) { + focusOutEvent(static_cast<QFocusEvent *>(event)); + return true; + } + if (!d_ptr->visible) { // Eaten return true; @@ -6664,9 +6669,6 @@ bool QGraphicsItem::sceneEvent(QEvent *event) case QEvent::FocusIn: focusInEvent(static_cast<QFocusEvent *>(event)); break; - case QEvent::FocusOut: - focusOutEvent(static_cast<QFocusEvent *>(event)); - break; case QEvent::GraphicsSceneContextMenu: contextMenuEvent(static_cast<QGraphicsSceneContextMenuEvent *>(event)); break; |