diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-05 00:10:31 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-05 00:10:31 (GMT) |
| commit | 7f94e6a6f48176a5b5cfd61c796a4fa2bcc63afb (patch) | |
| tree | b4741e78769d8af5eb97e0ce7337bb89db9e0ef1 /src/gui/graphicsview/qgraphicsitem.cpp | |
| parent | 68778d0d5c0eb9d85ac09e424bfabdd6ccce3b83 (diff) | |
| parent | a7bf1cfb1a75c35e837c01f4a5b0697fc8961148 (diff) | |
| download | Qt-7f94e6a6f48176a5b5cfd61c796a4fa2bcc63afb.zip Qt-7f94e6a6f48176a5b5cfd61c796a4fa2bcc63afb.tar.gz Qt-7f94e6a6f48176a5b5cfd61c796a4fa2bcc63afb.tar.bz2 | |
Merge remote branch 'origin/4.7' into master-from-4.7
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 ed163d7..810055f 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; |