Merge remote-tracking branch 'origin/5.9' into 5.105.10

 Conflicts:
	.qmake.conf

Change-Id: Ia407f277cccfdd96242ebfdbe294d699e26e6b1d

2 files changed, 93 insertions, 0 deletions

diff --git a/tests/auto/focus/tst_focus.cpp b/tests/auto/focus/tst_focus.cpp
index 3d4a8875..958b996b 100644
--- a/tests/auto/focus/tst_focus.cpp
+++ b/tests/auto/focus/tst_focus.cpp
@@ -67,6 +67,9 @@ private slots:
     void reason();
 
     void visualFocus();
+
+    void scope_data();
+    void scope();
 };
 
 void tst_focus::initTestCase()
@@ -326,6 +329,86 @@ void tst_focus::visualFocus()
     QVERIFY(!button->property("showFocus").toBool());
 }
 
+void tst_focus::scope_data()
+{
+    QTest::addColumn<QString>("name");
+
+    QTest::newRow("Frame") << "Frame";
+    QTest::newRow("GroupBox") << "Frame";
+    QTest::newRow("Page") << "Page";
+    QTest::newRow("Pane") << "Pane";
+    QTest::newRow("StackView") << "StackView";
+}
+
+void tst_focus::scope()
+{
+    QFETCH(QString, name);
+
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.setData(QString("import QtQuick 2.9; import QtQuick.Controls 2.2; ApplicationWindow { property alias child: child; width: 100; height: 100; %1 { anchors.fill: parent; Item { id: child; width: 10; height: 10 } } }").arg(name).toUtf8(), QUrl());
+
+    QScopedPointer<QQuickApplicationWindow> window(qobject_cast<QQuickApplicationWindow *>(component.create()));
+    QVERIFY2(window, qPrintable(component.errorString()));
+
+    QQuickControl *control = qobject_cast<QQuickControl *>(window->contentItem()->childItems().first());
+    QVERIFY(control);
+
+    control->setFocusPolicy(Qt::WheelFocus);
+    control->setAcceptedMouseButtons(Qt::LeftButton);
+
+    QQuickItem *child = window->property("child").value<QQuickItem *>();
+    QVERIFY(child);
+
+    window->show();
+    window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window.data()));
+
+    struct TouchDeviceDeleter
+    {
+        static inline void cleanup(QTouchDevice *device)
+        {
+            QWindowSystemInterface::unregisterTouchDevice(device);
+            delete device;
+        }
+    };
+
+    QScopedPointer<QTouchDevice, TouchDeviceDeleter> device(new QTouchDevice);
+    device->setType(QTouchDevice::TouchScreen);
+    QWindowSystemInterface::registerTouchDevice(device.data());
+
+    child->forceActiveFocus();
+    QVERIFY(child->hasActiveFocus());
+    QVERIFY(control->hasActiveFocus());
+
+    // Qt::ClickFocus (mouse)
+    QTest::mouseClick(window.data(), Qt::LeftButton, Qt::NoModifier, QPoint(control->width() / 2, control->height() / 2));
+    QVERIFY(!child->hasActiveFocus());
+    QVERIFY(control->hasActiveFocus());
+
+    // reset
+    child->forceActiveFocus();
+    QVERIFY(child->hasActiveFocus());
+    QVERIFY(control->hasActiveFocus());
+
+    // Qt::ClickFocus (touch)
+    QTest::touchEvent(window.data(), device.data()).press(0, QPoint(control->width() / 2, control->height() / 2));
+    QTest::touchEvent(window.data(), device.data()).release(0, QPoint(control->width() / 2, control->height() / 2));
+    QVERIFY(!child->hasActiveFocus());
+    QVERIFY(control->hasActiveFocus());
+
+    // reset
+    child->forceActiveFocus();
+    QVERIFY(child->hasActiveFocus());
+    QVERIFY(control->hasActiveFocus());
+
+    // Qt::WheelFocus
+    QWheelEvent wheelEvent(QPoint(control->width() / 2, control->height() / 2), 10, Qt::NoButton, Qt::NoModifier);
+    QGuiApplication::sendEvent(control, &wheelEvent);
+    QVERIFY(!child->hasActiveFocus());
+    QVERIFY(control->hasActiveFocus());
+}
+
 QTEST_MAIN(tst_focus)
 
 #include "tst_focus.moc"
diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp
index a1e5e246..550655ef 100644
--- a/tests/auto/qquickpopup/tst_qquickpopup.cpp
+++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp
@@ -565,6 +565,16 @@ void tst_QQuickPopup::activeFocusOnClose1()
     nonFocusedPopup->close();
     QVERIFY(!nonFocusedPopup->isVisible());
     QVERIFY(focusedPopup->hasActiveFocus());
+
+    // QTBUG-66113: force active focus on a popup that did not request focus
+    nonFocusedPopup->open();
+    nonFocusedPopup->forceActiveFocus();
+    QVERIFY(nonFocusedPopup->isVisible());
+    QVERIFY(nonFocusedPopup->hasActiveFocus());
+
+    nonFocusedPopup->close();
+    QVERIFY(!nonFocusedPopup->isVisible());
+    QVERIFY(focusedPopup->hasActiveFocus());
 }
 
 void tst_QQuickPopup::activeFocusOnClose2()