diff options
author | David Boddie <dboddie@trolltech.com> | 2010-08-06 17:51:14 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-08-06 17:51:14 (GMT) |
commit | 86eec3f6f98b387bf6a815c1a8e916965928b317 (patch) | |
tree | eae5c5e72da6fe0c5939e6b730f1218db7c6372d /src/declarative/graphicsitems | |
parent | 9d15caa7f1103060f5fe1f8283e834ff51591a3f (diff) | |
parent | c45516f1f3781dcb504158f730b98897c7f2f2a1 (diff) | |
download | Qt-86eec3f6f98b387bf6a815c1a8e916965928b317.zip Qt-86eec3f6f98b387bf6a815c1a8e916965928b317.tar.gz Qt-86eec3f6f98b387bf6a815c1a8e916965928b317.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
src/declarative/util/qdeclarativeanimation.cpp
Diffstat (limited to 'src/declarative/graphicsitems')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 50998eb..5b74129 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2406,18 +2406,7 @@ void QDeclarativeItemPrivate::focusChanged(bool flag) Q_Q(QDeclarativeItem); if (!(flags & QGraphicsItem::ItemIsFocusScope) && parent) emit q->activeFocusChanged(flag); //see also QDeclarativeItemPrivate::subFocusItemChange() - - bool inScope = false; - QGraphicsItem *p = parent; - while (p) { - if (p->flags() & QGraphicsItem::ItemIsFocusScope) { - inScope = true; - break; - } - p = p->parentItem(); - } - if (!inScope) - emit q->focusChanged(flag); + emit q->focusChanged(flag); } /*! \internal */ |