diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-10 17:16:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-10 17:16:57 (GMT) |
| commit | d50278c22bf748691719abfd2837f96deabda033 (patch) | |
| tree | 412f62260ad6c8375b6a5c9ec6f681f47f42184b /src/gui/graphicsview/qgraphicsitem.cpp | |
| parent | d63778ce3942130eb6fdd8ef173ba50ed0f49a5c (diff) | |
| parent | 1b3514e4b2d9a41f73bf5b87caf73ce409eadf2a (diff) | |
| download | Qt-d50278c22bf748691719abfd2837f96deabda033.zip Qt-d50278c22bf748691719abfd2837f96deabda033.tar.gz Qt-d50278c22bf748691719abfd2837f96deabda033.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix QGraphicsScene returning incorrect focus item.
Not requiring valid QTextBlock in previous()
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index f463887..1caa325 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -5577,8 +5577,10 @@ void QGraphicsItemPrivate::setSubFocus(QGraphicsItem *rootItem, QGraphicsItem *s parent->d_ptr->subFocusItemChange(); } while (!parent->isPanel() && (parent = parent->d_ptr->parent) && (visible || !parent->d_ptr->visible)); - if (scene && !scene->isActive()) + if (scene && !scene->isActive()) { + scene->d_func()->passiveFocusItem = subFocusItem; scene->d_func()->lastFocusItem = subFocusItem; + } } /*! |