diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-30 08:18:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-30 08:18:02 (GMT) |
| commit | 50781a66bd11c3201c7f9c520490dc352e239dac (patch) | |
| tree | 75d77ca3aca8fe671c54e74ed191d1938f6db765 /src/declarative | |
| parent | 78c5825cfb7702350636b7624bf79311dbd0dbd5 (diff) | |
| parent | a1b2be3c8a64aee832c648c6dcdff003f22318a3 (diff) | |
| download | Qt-50781a66bd11c3201c7f9c520490dc352e239dac.zip Qt-50781a66bd11c3201c7f9c520490dc352e239dac.tar.gz Qt-50781a66bd11c3201c7f9c520490dc352e239dac.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarative::hasActiveFocus should return false for hidden items
FocusScope's focusItem must always be a descendent
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 805ca4d..7127173 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -3600,8 +3600,8 @@ void QDeclarativeItem::setSize(const QSizeF &size) bool QDeclarativeItem::hasActiveFocus() const { Q_D(const QDeclarativeItem); - return focusItem() == this || - (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0); + return (focusItem() && focusItem()->isVisible()) && (focusItem() == this || + (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0)); } /*! |