summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@nokia.com>2009-11-17 16:26:50 (GMT)
committerYoann Lopes <yoann.lopes@nokia.com>2009-11-17 16:26:50 (GMT)
commit67b7d3ee2c30a710e765252a29ecb9a0ffd0a7a6 (patch)
tree09901a4f0892a8d60b02692e64e2ab391292872c /src/gui/graphicsview
parent162071d2651645358a0935b27af8a3b47474a10f (diff)
parent1188cd220787162a2c8327ea1291a743863b12c5 (diff)
downloadQt-67b7d3ee2c30a710e765252a29ecb9a0ffd0a7a6.zip
Qt-67b7d3ee2c30a710e765252a29ecb9a0ffd0a7a6.tar.gz
Qt-67b7d3ee2c30a710e765252a29ecb9a0ffd0a7a6.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/graphicsview')
-rw-r--r--src/gui/graphicsview/qgraphicsview.cpp2
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.)).