Fix QDeclarativeItem::hasActiveFocus().

This function returns true if the item (or, in case it's a focus
scope, one of its children,) has focus (i.e., will
receive key events now), or will receive focus once the scene is
activated. It also returns true if the item has not yet been added
to a scene, but has subFocus, implicating that someone has called
setFocus() on it prior to it being added to the scene; the latter
case seen most commonly in unit tests.

Cherry-picked from qt/qtquick1: bb364c14157df635cf166b293f8cab6c22534aa1

Task number: QTBUG-24681

Change-Id: I2f2d9dd81820e94202a44393a38972c868a774b7
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index fa6e8e1..46070ea 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -3600,8 +3600,11 @@ void QDeclarativeItem::setSize(const QSizeF &size)
 bool QDeclarativeItem::hasActiveFocus() const
 {
     Q_D(const QDeclarativeItem);
-    return (focusItem() && focusItem()->isVisible()) && (focusItem() == this ||
-           (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0));
+    QGraphicsItem *fi = focusItem();
+    QGraphicsScene *s = scene();
+    bool hasOrWillGainFocus = fi && fi->isVisible() && (!s || s->focusItem() == fi);
+    bool isOrIsScopeOfFocusItem = (fi == this || (d->flags & QGraphicsItem::ItemIsFocusScope));
+    return hasOrWillGainFocus && isOrIsScopeOfFocusItem;
 }
 
 /*!