diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-17 17:38:37 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-17 17:38:50 (GMT) |
| commit | a61adccf96a8ceefbf1150966adda3f6d226ec6d (patch) | |
| tree | 7f01b588860f34b27f9c68146b603948d391bb8c /src/gui/graphicsview | |
| parent | 334b2a93d461ae9a8b258fff1971fb775b13bb68 (diff) | |
| parent | ecc202c0410125c944f156b5d0de67f093c02723 (diff) | |
| download | Qt-a61adccf96a8ceefbf1150966adda3f6d226ec6d.zip Qt-a61adccf96a8ceefbf1150966adda3f6d226ec6d.tar.gz Qt-a61adccf96a8ceefbf1150966adda3f6d226ec6d.tar.bz2 | |
Merge oslo-staging-2/4.6 into upstream/4.6
Diffstat (limited to 'src/gui/graphicsview')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 3ef311c..3f9f443 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -1517,6 +1517,8 @@ void QGraphicsView::setScene(QGraphicsScene *scene) QEvent windowDeactivate(QEvent::WindowDeactivate); QApplication::sendEvent(d->scene, &windowDeactivate); } + if(hasFocus()) + d->scene->clearFocus(); } // Assign the new scene and update the contents (scrollbars, etc.)). |