Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Ie6039c9ad6c5b0d5077383f0a797be320cd34739

6 files changed, 195 insertions, 14 deletions

diff --git a/tests/auto/controls/data/tst_dial.qml b/tests/auto/controls/data/tst_dial.qml
index 86999594..26f30c33 100644
--- a/tests/auto/controls/data/tst_dial.qml
+++ b/tests/auto/controls/data/tst_dial.qml
@@ -223,33 +223,39 @@ TestCase {
         var minimumExpectedValueCount = data.live ? 2 : 1;
 
         // drag to the left
-        mouseDrag(dial, dial.width / 2, dial.height / 2, -dial.width / 2, 0, Qt.LeftButton);
+        // we always add or subtract 1 to ensure we start the drag from the opposite side
+        // of where we're dragging to, for more reliable tests
+        mouseDrag(dial, dial.width / 2 + 1, dial.height / 2, -dial.width / 2, 0, Qt.LeftButton);
         fuzzyCompare(dial.value, data.leftValue, 0.1);
-        verify(valueSpy.count >= minimumExpectedValueCount);
+        verify(valueSpy.count >= minimumExpectedValueCount, "expected valueChanged to be emitted at least "
+            + minimumExpectedValueCount + " time(s), but it was only emitted " + valueSpy.count + " time(s)");
         valueSpy.clear();
         verify(moveSpy.count > 0);
         moveSpy.clear();
 
         // drag to the top
-        mouseDrag(dial, dial.width / 2, dial.height / 2, 0, -dial.height / 2, Qt.LeftButton);
+        mouseDrag(dial, dial.width / 2, dial.height / 2 + 1, 0, -dial.height / 2, Qt.LeftButton);
         fuzzyCompare(dial.value, data.topValue, 0.1);
-        verify(valueSpy.count >= minimumExpectedValueCount);
+        verify(valueSpy.count >= minimumExpectedValueCount, "expected valueChanged to be emitted at least "
+            + minimumExpectedValueCount + " time(s), but it was only emitted " + valueSpy.count + " time(s)");
         valueSpy.clear();
         verify(moveSpy.count > 0);
         moveSpy.clear();
 
         // drag to the right
-        mouseDrag(dial, dial.width / 2, dial.height / 2, dial.width / 2, 0, Qt.LeftButton);
+        mouseDrag(dial, dial.width / 2 - 1, dial.height / 2, dial.width / 2, 0, Qt.LeftButton);
         fuzzyCompare(dial.value, data.rightValue, 0.1);
-        verify(valueSpy.count >= minimumExpectedValueCount);
+        verify(valueSpy.count >= minimumExpectedValueCount, "expected valueChanged to be emitted at least "
+            + minimumExpectedValueCount + " time(s), but it was only emitted " + valueSpy.count + " time(s)");
         valueSpy.clear();
         verify(moveSpy.count > 0);
         moveSpy.clear();
 
         // drag to the bottom (* 0.6 to ensure we don't go over to the minimum position)
-        mouseDrag(dial, dial.width / 2, dial.height / 2, 10, dial.height / 2, Qt.LeftButton);
+        mouseDrag(dial, dial.width / 2, dial.height / 2 - 1, 10, dial.height / 2, Qt.LeftButton);
         fuzzyCompare(dial.value, data.bottomValue, 0.1);
-        verify(valueSpy.count >= minimumExpectedValueCount);
+        verify(valueSpy.count >= minimumExpectedValueCount, "expected valueChanged to be emitted at least "
+            + minimumExpectedValueCount + " time(s), but it was only emitted " + valueSpy.count + " time(s)");
         valueSpy.clear();
         verify(moveSpy.count > 0);
         moveSpy.clear();
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index d3a0d8bb..22dbb352 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -658,4 +658,20 @@ TestCase {
             compare(control.displayText, data.displayTexts[i])
         }
     }
+
+    Component {
+        id: overriddenSpinBox
+        SpinBox {
+            value: 50
+            up.indicator: Rectangle {
+                property string s: "this is the one"
+            }
+        }
+    }
+
+    function test_indicatorOverridden() {
+        var control = createTemporaryObject(overriddenSpinBox, testCase)
+        verify(control)
+        compare(control.up.indicator.s, "this is the one");
+    }
 }
diff --git a/tests/auto/customization/data/styles/identified/AbstractButton.qml b/tests/auto/customization/data/styles/identified/AbstractButton.qml
index b9656f7a..cd2b5bdc 100644
--- a/tests/auto/customization/data/styles/identified/AbstractButton.qml
+++ b/tests/auto/customization/data/styles/identified/AbstractButton.qml
@@ -58,15 +58,18 @@ T.AbstractButton {
     indicator: Item {
         id: indicator
         objectName: "abstractbutton-indicator-identified"
+        Accessible.name: objectName
     }
 
     contentItem: Item {
         id: contentItem
         objectName: "abstractbutton-contentItem-identified"
+        Accessible.name: objectName
     }
 
     background: Item {
         id: background
         objectName: "abstractbutton-background-identified"
+        Accessible.name: objectName
     }
 }
diff --git a/tests/auto/customization/tst_customization.cpp b/tests/auto/customization/tst_customization.cpp
index 41efc2a6..cce74b41 100644
--- a/tests/auto/customization/tst_customization.cpp
+++ b/tests/auto/customization/tst_customization.cpp
@@ -42,6 +42,7 @@
 #include <QtQuick/qquickitem.h>
 #include <QtQuick/qquickwindow.h>
 #include <QtQuickControls2/qquickstyle.h>
+#include <QtQuickTemplates2/private/qquickcontrol_p_p.h>
 #include "../shared/visualtestutil.h"
 
 using namespace QQuickVisualTestUtil;
@@ -439,11 +440,36 @@ void tst_customization::override()
     QVERIFY2(qt_createdQObjects()->isEmpty(), qPrintable("unexpectedly created: " + qt_createdQObjects->join(", ")));
 
     if (!nonDeferred.isEmpty()) {
-        for (QString delegate : qAsConst(delegates)) {
-            if (!delegate.contains("-"))
-                delegate.append("-" + nonDeferred);
-            delegate.prepend(type.toLower() + "-");
-            QVERIFY2(qt_destroyedQObjects()->removeOne(delegate), qPrintable(delegate + " was not destroyed as expected"));
+        // There were items for which deferred execution was not possible.
+        for (QString delegateName : qAsConst(delegates)) {
+            if (!delegateName.contains("-"))
+                delegateName.append("-" + nonDeferred);
+            delegateName.prepend(type.toLower() + "-");
+
+            const int delegateIndex = qt_destroyedQObjects()->indexOf(delegateName);
+            QVERIFY2(delegateIndex == -1, qPrintable(delegateName + " was unexpectedly destroyed"));
+
+            const auto controlChildren = control->children();
+            const auto childIt = std::find_if(controlChildren.constBegin(), controlChildren.constEnd(), [delegateName](const QObject *child) {
+                return child->objectName() == delegateName;
+            });
+            // We test other delegates (like the background) here, so make sure we don't end up with XPASSes by using the wrong delegate.
+            if (delegateName.contains(QLatin1String("handle"))) {
+                QEXPECT_FAIL("identified:RangeSlider", "For some reason, items that are belong to grouped properties fail here", Abort);
+                QEXPECT_FAIL("overidentified:RangeSlider", "For some reason, items that are belong to grouped properties fail here", Abort);
+            }
+            if (delegateName.contains(QLatin1String("indicator"))) {
+                QEXPECT_FAIL("identified:SpinBox", "For some reason, items that are belong to grouped properties fail here", Abort);
+                QEXPECT_FAIL("overidentified:SpinBox", "For some reason, items that are belong to grouped properties fail here", Abort);
+            }
+            QVERIFY2(childIt != controlChildren.constEnd(), qPrintable(QString::fromLatin1(
+                "Expected delegate \"%1\" to still be a QObject child of \"%2\"").arg(delegateName).arg(controlName)));
+
+            const auto *delegate = qobject_cast<QQuickItem*>(*childIt);
+            // Ensure that the item is hidden, etc.
+            QVERIFY(delegate);
+            QCOMPARE(delegate->isVisible(), false);
+            QCOMPARE(delegate->parentItem(), nullptr);
         }
     }
 
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml b/tests/auto/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml
new file mode 100644
index 00000000..56cf85b6
--- /dev/null
+++ b/tests/auto/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+
+ApplicationWindow {
+    width: 400
+    height: 400
+
+    property alias button: button
+    property alias popup1: popup1
+    property alias popup2: popup2
+
+    Button {
+        id: button
+        focus: true
+    }
+
+    Popup {
+        id: popup1
+        focus: true
+        enter: Transition { NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; duration: 200 } }
+        exit: Transition { NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; duration: 200 } }
+    }
+
+    Popup {
+        id: popup2
+        focus: true
+        enter: Transition { NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; duration: 100 } }
+        exit: Transition { NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; duration: 100 } }
+    }
+}
diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp
index fc2ac881..f0d8b004 100644
--- a/tests/auto/qquickpopup/tst_qquickpopup.cpp
+++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp
@@ -72,6 +72,7 @@ private slots:
     void activeFocusOnClose1();
     void activeFocusOnClose2();
     void activeFocusOnClose3();
+    void activeFocusOnClosingSeveralPopups();
     void hover_data();
     void hover();
     void wheel_data();
@@ -667,6 +668,54 @@ void tst_QQuickPopup::activeFocusOnClose3()
     QTRY_VERIFY(popup2->hasActiveFocus());
 }
 
+void tst_QQuickPopup::activeFocusOnClosingSeveralPopups()
+{
+    // Test that active focus isn't lost when multiple popup closing simultaneously
+    QQuickApplicationHelper helper(this, QStringLiteral("activeFocusOnClosingSeveralPopups.qml"));
+    QQuickApplicationWindow *window = helper.appWindow;
+    window->show();
+    window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window));
+
+    QQuickItem *button = window->property("button").value<QQuickItem *>();
+    QVERIFY(button);
+
+    QQuickPopup *popup1 = window->property("popup1").value<QQuickPopup *>();
+    QVERIFY(popup1);
+
+    QQuickPopup *popup2 = window->property("popup2").value<QQuickPopup *>();
+    QVERIFY(popup2);
+
+    QCOMPARE(button->hasActiveFocus(), true);
+    popup1->open();
+    QTRY_VERIFY(popup1->isOpened());
+    QVERIFY(popup1->hasActiveFocus());
+    popup2->open();
+    QTRY_VERIFY(popup2->isOpened());
+    QVERIFY(popup2->hasActiveFocus());
+    QTRY_COMPARE(button->hasActiveFocus(), false);
+    // close the unfocused popup first
+    popup1->close();
+    popup2->close();
+    QTRY_VERIFY(!popup1->isVisible());
+    QTRY_VERIFY(!popup2->isVisible());
+    QTRY_COMPARE(button->hasActiveFocus(), true);
+
+    popup1->open();
+    QTRY_VERIFY(popup1->isOpened());
+    QVERIFY(popup1->hasActiveFocus());
+    popup2->open();
+    QTRY_VERIFY(popup2->isOpened());
+    QVERIFY(popup2->hasActiveFocus());
+    QTRY_COMPARE(button->hasActiveFocus(), false);
+    // close the focused popup first
+    popup2->close();
+    popup1->close();
+    QTRY_VERIFY(!popup1->isVisible());
+    QTRY_VERIFY(!popup2->isVisible());
+    QTRY_COMPARE(button->hasActiveFocus(), true);
+}
+
 void tst_QQuickPopup::hover_data()
 {
     QTest::addColumn<QString>("source");
@@ -1029,12 +1078,13 @@ void tst_QQuickPopup::closeOnEscapeWithVisiblePopup()
     QQuickApplicationHelper helper(this, QStringLiteral("closeOnEscapeWithVisiblePopup.qml"));
     QQuickWindow *window = helper.window;
     window->show();
-    QVERIFY(QTest::qWaitForWindowExposed(window));
+    QVERIFY(QTest::qWaitForWindowActive(window));
 
     QQuickPopup *popup = window->findChild<QQuickPopup *>("popup");
     QVERIFY(popup);
     QTRY_VERIFY(popup->isOpened());
 
+    QTRY_VERIFY(window->activeFocusItem());
     QTest::keyClick(window, Qt::Key_Escape);
     QTRY_VERIFY(!popup->isVisible());
 }