Merge remote-tracking branch 'origin/5.13' into 5.14

Change-Id: I53fc18c168daff6dfb504e5a64e20570de7d24ac

4 files changed, 169 insertions, 3 deletions

diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/controls/data/tst_tooltip.qml
index 18911895..70579c70 100644
--- a/tests/auto/controls/data/tst_tooltip.qml
+++ b/tests/auto/controls/data/tst_tooltip.qml
@@ -205,6 +205,15 @@ TestCase {
         else
             control.visible = true
         compare(control.visible, true)
+        // wait a bit to make sure that it's still visible
+        wait(50)
+        compare(control.visible, true)
+        // re-arm for another 200 ms
+        control.timeout = 200
+        compare(control.visible, true)
+        // ensure that it's still visible after 150 ms (where old timeout < 150 < new timeout)
+        wait(150)
+        compare(control.visible, true)
         tryCompare(control, "visible", false)
     }
 
diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml
index c9cc10d7..5b3ef6e3 100644
--- a/tests/auto/controls/data/tst_tumbler.qml
+++ b/tests/auto/controls/data/tst_tumbler.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** 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.
@@ -54,8 +54,8 @@ import QtQuick.Controls 2.12
 
 TestCase {
     id: testCase
-    width: 200
-    height: 200
+    width: 300
+    height: 300
     visible: true
     when: windowShown
     name: "Tumbler"
@@ -513,6 +513,7 @@ TestCase {
         Text {
             text: parent.displacement.toFixed(2)
             anchors.right: parent.right
+            anchors.verticalCenter: parent.verticalCenter
         }
 
         property real displacement: Tumbler.displacement
@@ -1236,4 +1237,24 @@ TestCase {
         // 5 - 2 = 3
         compare(tumbler.currentIndex, 3);
     }
+
+    function test_displacementAfterResizing() {
+        createTumbler({
+            width: 200,
+            wrap: false,
+            delegate: displacementDelegate,
+            model: 30,
+            visibleItemCount: 7,
+            currentIndex: 15
+        })
+
+        var delegate = findChild(tumblerView, "delegate15")
+        verify(delegate)
+
+        tryCompare(delegate, "displacement", 0)
+
+        // Resizing the Tumbler shouldn't affect the displacement.
+        tumbler.height *= 1.4
+        tryCompare(delegate, "displacement", 0)
+    }
 }
diff --git a/tests/auto/qquickpopup/data/toolTipCrashOnClose.qml b/tests/auto/qquickpopup/data/toolTipCrashOnClose.qml
new file mode 100644
index 00000000..8de14f4c
--- /dev/null
+++ b/tests/auto/qquickpopup/data/toolTipCrashOnClose.qml
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** 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.Window 2.13
+import QtQuick.Controls 2.13
+import QtGraphicalEffects 1.13
+
+Window {
+    width: 640
+    height: 480
+
+    readonly property bool toolTipOpened: mouseArea.ToolTip.toolTip.opened
+
+    Component.onCompleted: contentItem.objectName = "windowContentItem"
+
+    // For the setOverlayParentToNull test.
+    function nullifyOverlayParent() {
+        Overlay.overlay.parent = null
+    }
+
+    Item {
+        objectName: "outerItem"
+        anchors.fill: parent
+
+        Item {
+            objectName: "innerItem"
+            anchors.fill: parent
+
+            ColorOverlay {
+                objectName: "colorOverlay"
+                source: parent
+                anchors.fill: parent
+            }
+
+            MouseArea {
+                id: mouseArea
+                objectName: "mouseArea"
+                anchors.fill: parent
+                hoverEnabled: true
+
+                ToolTip.visible: containsMouse
+                ToolTip.text: "ToolTip text"
+            }
+        }
+    }
+}
diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp
index 636b2b21..4d238663 100644
--- a/tests/auto/qquickpopup/tst_qquickpopup.cpp
+++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp
@@ -89,6 +89,8 @@ private slots:
     void disabledPalette();
     void disabledParentPalette();
     void countChanged();
+    void toolTipCrashOnClose();
+    void setOverlayParentToNull();
 };
 
 void tst_QQuickPopup::initTestCase()
@@ -1187,6 +1189,46 @@ void tst_QQuickPopup::countChanged()
     QVERIFY(window->setProperty("isModel1", false));
     QTRY_COMPARE(window->property("count").toInt(), 2);
 }
+
+// QTBUG-73243
+void tst_QQuickPopup::toolTipCrashOnClose()
+{
+    QQuickApplicationHelper helper(this, "toolTipCrashOnClose.qml");
+
+    QQuickWindow *window = helper.window;
+    window->show();
+    // TODO: Using ignoreMessage() fails in CI with macOS for release builds,
+    // so for now we let the warning through.
+//    QTest::ignoreMessage(QtWarningMsg, "ShaderEffectSource: 'recursive' must be set to true when rendering recursively.");
+    QVERIFY(QTest::qWaitForWindowActive(window));
+
+    QTest::mouseMove(window, QPoint(window->width() / 2, window->height() / 2));
+    QTRY_VERIFY(window->property("toolTipOpened").toBool());
+
+    QVERIFY(window->close());
+    // Shouldn't crash.
+}
+
+void tst_QQuickPopup::setOverlayParentToNull()
+{
+    QQuickApplicationHelper helper(this, "toolTipCrashOnClose.qml");
+
+    QQuickWindow *window = helper.window;
+    window->show();
+    // TODO: Using ignoreMessage() fails in CI with macOS for release builds,
+    // so for now we let the warning through.
+//    QTest::ignoreMessage(QtWarningMsg, "ShaderEffectSource: 'recursive' must be set to true when rendering recursively.");
+    QVERIFY(QTest::qWaitForWindowActive(window));
+
+    QVERIFY(QMetaObject::invokeMethod(window, "nullifyOverlayParent"));
+
+    QTest::mouseMove(window, QPoint(window->width() / 2, window->height() / 2));
+    QTRY_VERIFY(window->property("toolTipOpened").toBool());
+
+    QVERIFY(window->close());
+    // While nullifying the overlay parent doesn't make much sense, it shouldn't crash.
+}
+
 QTEST_QUICKCONTROLS_MAIN(tst_QQuickPopup)
 
 #include "tst_qquickpopup.moc"