summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-03-04 04:49:56 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-03-04 04:49:56 (GMT)
commitba85f14b140c08cbafe263954947d818152146e0 (patch)
treef4aef61ed35c7cfd66195e160b963b1a40b65a98 /src/declarative/util
parenteda079761194a96783cdb8d49c79eb2c9c0b7dac (diff)
parent8047d8f2e63df60b5ea3f6fd02568658c3d19fc6 (diff)
downloadQt-ba85f14b140c08cbafe263954947d818152146e0.zip
Qt-ba85f14b140c08cbafe263954947d818152146e0.tar.gz
Qt-ba85f14b140c08cbafe263954947d818152146e0.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qdeclarativeview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index f08e634..cd67aeb 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -194,6 +194,7 @@ void QDeclarativeViewPrivate::execute()
\o Initializes QGraphicsView for QML key handling:
\list
\o QGraphicsView::viewport()->setFocusPolicy(Qt::NoFocus);
+ \o QGraphicsView::setFocusPolicy(Qt::StrongFocus);
\o QGraphicsScene::setStickyFocus(true);
\endlist
\endlist
@@ -268,6 +269,7 @@ void QDeclarativeViewPrivate::init()
q->setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
scene.setItemIndexMethod(QGraphicsScene::NoIndex);
q->viewport()->setFocusPolicy(Qt::NoFocus);
+ q->setFocusPolicy(Qt::StrongFocus);
scene.setStickyFocus(true); //### needed for correct focus handling
}