3 files changed, 94 insertions, 0 deletions

diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 82f4fac2bf..464076cbf8 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -4798,14 +4798,26 @@ void QQuickItem::forceActiveFocus()
 
 void QQuickItem::forceActiveFocus(Qt::FocusReason reason)
 {
+    Q_D(QQuickItem);
     setFocus(true, reason);
     QQuickItem *parent = parentItem();
+    QQuickItem *scope = nullptr;
     while (parent) {
         if (parent->flags() & QQuickItem::ItemIsFocusScope) {
             parent->setFocus(true, reason);
+            if (!scope)
+                scope = parent;
         }
         parent = parent->parentItem();
     }
+    // In certain reparenting scenarios, d->focus might be true and the scope
+    // might also have focus, so that setFocus() returns early without actually
+    // acquiring active focus, because it thinks it already has it. In that
+    // case, try to set the DeliveryAgent's active focus. (QTBUG-89736).
+    if (scope && !d->activeFocus) {
+        if (auto da = d->deliveryAgentPrivate())
+            da->setFocusInScope(scope, this, Qt::OtherFocusReason);
+    }
 }
 
 /*!
diff --git a/tests/auto/quick/qquickitem2/data/focusableItemReparentedToLoadedComponent.qml b/tests/auto/quick/qquickitem2/data/focusableItemReparentedToLoadedComponent.qml
new file mode 100644
index 0000000000..a690c4243b
--- /dev/null
+++ b/tests/auto/quick/qquickitem2/data/focusableItemReparentedToLoadedComponent.qml
@@ -0,0 +1,51 @@
+import QtQuick 2.12
+
+Item {
+    width: 240; height: 240
+    Loader {
+        id: loader
+        sourceComponent: surfaceParent
+        anchors.fill: parent
+
+        onStatusChanged: {
+            if (status === Loader.Ready) {
+                holder.create()
+                holder.item.parent = item
+            } else if (status === Loader.Null){
+                holder.item.parent = null
+            }
+        }
+    }
+
+    property var holder: QtObject {
+        property bool created: false
+        function create()
+        {
+            if (!created)
+                surfaceComponent.createObject(item)
+            created = true
+        }
+
+        property Item item: Item {
+            anchors.fill: parent
+            Component {
+                id: surfaceComponent
+                Item {
+                    anchors.fill: parent
+                    TextInput {
+                        width: parent.width
+                        font.pixelSize: 40
+                        text: "focus me"
+                    }
+                }
+            }
+        }
+    }
+
+    Component {
+        id: surfaceParent
+        Rectangle {
+            anchors.fill: parent
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
index ec3ce69433..a33290153a 100644
--- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
@@ -33,6 +33,7 @@
 #include <QtQuick/qquickitemgrabresult.h>
 #include <QtQuick/qquickview.h>
 #include <QtGui/private/qinputmethod_p.h>
+#include <QtQuick/private/qquickloader_p.h>
 #include <QtQuick/private/qquickrectangle_p.h>
 #include <QtQuick/private/qquicktextinput_p.h>
 #include <QtQuick/private/qquickitemchangelistener_p.h>
@@ -75,6 +76,7 @@ private slots:
     void qtbug_50516();
     void qtbug_50516_2_data();
     void qtbug_50516_2();
+    void focusableItemReparentedToLoadedComponent();
 
     void keys();
 #if QT_CONFIG(shortcut)
@@ -1400,6 +1402,35 @@ void tst_QQuickItem::qtbug_50516_2()
     delete window;
 }
 
+void tst_QQuickItem::focusableItemReparentedToLoadedComponent() // QTBUG-89736
+{
+    QQuickView window;
+    window.setSource(testFileUrl("focusableItemReparentedToLoadedComponent.qml"));
+    window.show();
+    QVERIFY(QTest::qWaitForWindowActive(&window));
+    QCOMPARE(QGuiApplication::focusWindow(), &window);
+    QQuickLoader *loader = window.rootObject()->findChild<QQuickLoader *>();
+    QVERIFY(loader);
+    QTRY_VERIFY(loader->status() == QQuickLoader::Ready);
+    QQuickTextInput *textInput = window.rootObject()->findChild<QQuickTextInput *>();
+    QVERIFY(textInput);
+
+    // click to focus
+    QTest::mouseClick(&window, Qt::LeftButton, Qt::NoModifier, {10, 10});
+    QTRY_VERIFY(textInput->hasActiveFocus());
+
+    // unload and reload
+    auto component = loader->sourceComponent();
+    loader->resetSourceComponent();
+    QTRY_VERIFY(loader->status() == QQuickLoader::Null);
+    loader->setSourceComponent(component);
+    QTRY_VERIFY(loader->status() == QQuickLoader::Ready);
+
+    // click to focus again
+    QTest::mouseClick(&window, Qt::LeftButton, Qt::NoModifier, {10, 10});
+    QTRY_VERIFY(textInput->hasActiveFocus());
+}
+
 void tst_QQuickItem::keys()
 {
     QQuickView *window = new QQuickView(nullptr);