3 files changed, 16 insertions, 6 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 31fd53a..4f8755e 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -1007,6 +1007,9 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent)
                 setEnabledHelper(parent->isEnabled(), /* explicit = */ false, /* update = */ !implicitUpdate);
         }
 
+        // Auto-activate if visible and the parent is active.
+        if (q->isVisible() && parent->isActive())
+            q->setActive(true);
     } else {
         // Inherit ancestor flags from the new parent.
         updateAncestorFlag(QGraphicsItem::GraphicsItemFlag(-2));
@@ -1941,6 +1944,17 @@ void QGraphicsItemPrivate::setVisibleHelper(bool newVisible, bool explicitly, bo
             child->d_ptr->setVisibleHelper(newVisible, false, updateChildren);
     }
 
+    // Update activation
+    if (scene && q->isPanel()) {
+        if (newVisible) {
+            if (parent && parent->isActive())
+                q->setActive(true);
+        } else {
+            if (q->isActive())
+                scene->setActivePanel(parent);
+        }
+    }
+
     // Enable subfocus
     if (newVisible && isWidget) {
         QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(q_ptr);
diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/gui/graphicsview/qgraphicsproxywidget.cpp
index 447fc50..c710c55 100644
--- a/src/gui/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp
@@ -390,7 +390,7 @@ QWidget *QGraphicsProxyWidgetPrivate::findFocusChild(QWidget *child, bool next)
         if (child->isEnabled()
 	    && child->isVisibleTo(widget)
             && (child->focusPolicy() & Qt::TabFocus)) {
-	    return child;
+            return child;
         }
         child = next ? child->d_func()->focus_next : child->d_func()->focus_prev;
     } while (child != oldChild && !(next && child == widget) && !(!next && child == widget->d_func()->focus_prev));
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index 9972223..afabf49 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -1665,11 +1665,7 @@ void QGraphicsWidget::setWindowFlags(Qt::WindowFlags wFlags)
 */
 bool QGraphicsWidget::isActiveWindow() const
 {
-    Q_D(const QGraphicsWidget);
-    if (!d->scene)
-        return false;
-    const QGraphicsWidget *w = window();
-    return (!w && d->scene->isActive()) || (w && d->scene->activeWindow() == w);
+    return isActive();
 }
 
 /*!