Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I6f2152aeecaeb8e63fdbc1cdf1444132a054b6f5

12 files changed, 374 insertions, 27 deletions

diff --git a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/data/dragParentOfMPTA.qml b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/data/dragParentOfMPTA.qml
new file mode 100644
index 0000000000..dc7e5f6411
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/data/dragParentOfMPTA.qml
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** 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:GPL-EXCEPT$
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.12
+
+Item {
+    width: 640
+    height: 480
+    property alias touchpointPressed: tp1.pressed
+
+    Rectangle {
+        color: tp1.pressed ? "lightsteelblue" : drag.active ? "tomato" : "wheat"
+        width: 180
+        height: 180
+
+        DragHandler { id: drag }
+
+        MultiPointTouchArea {
+            anchors.fill: parent
+            touchPoints: [
+                TouchPoint { id: tp1 }
+            ]
+        }
+    }
+}
diff --git a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp
index 58bc3d40b5..35fed99e8b 100644
--- a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp
+++ b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp
@@ -56,6 +56,7 @@ private slots:
     void touchDrag();
     void touchesThenPinch();
     void unloadHandlerWithPassiveGrab();
+    void dragHandlerInParentStealingGrabFromItem();
 
 private:
     void createView(QScopedPointer<QQuickView> &window, const char *fileName);
@@ -300,6 +301,48 @@ void tst_MptaInterop::unloadHandlerWithPassiveGrab()
     QTest::mouseRelease(window, Qt::LeftButton, 0, point); // QTBUG-73819: don't crash
 }
 
+void tst_MptaInterop::dragHandlerInParentStealingGrabFromItem() // QTBUG-75025
+{
+    const int dragThreshold = QGuiApplication::styleHints()->startDragDistance();
+    QScopedPointer<QQuickView> windowPtr;
+    createView(windowPtr, "dragParentOfMPTA.qml");
+    QQuickView * window = windowPtr.data();
+    auto pointerEvent = QQuickWindowPrivate::get(window)->pointerEventInstance(QQuickPointerDevice::genericMouseDevice());
+
+    QPointer<QQuickPointerHandler> handler = window->rootObject()->findChild<QQuickPointerHandler*>();
+    QVERIFY(handler);
+    QQuickMultiPointTouchArea *mpta = window->rootObject()->findChild<QQuickMultiPointTouchArea*>();
+    QVERIFY(mpta);
+
+    // In QTBUG-75025 there is a QQ Controls Button; the MPTA here stands in for that,
+    // simply as an Item that grabs the mouse.  The bug has nothing to do with MPTA specifically.
+
+    QPoint point(20, 20);
+    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, point);
+    QCOMPARE(window->mouseGrabberItem(), mpta);
+    QCOMPARE(window->rootObject()->property("touchpointPressed").toBool(), true);
+
+    // Start dragging
+    // DragHandler keeps monitoring, due to its passive grab,
+    // and eventually steals the exclusive grab from MPTA
+    int dragStoleGrab = 0;
+    for (int i = 0; i < 4; ++i) {
+        point += QPoint(dragThreshold / 2, 0);
+        QTest::mouseMove(window, point);
+        if (!dragStoleGrab && pointerEvent->point(0)->exclusiveGrabber() == handler)
+            dragStoleGrab = i;
+    }
+    if (dragStoleGrab)
+        qCDebug(lcPointerTests, "DragHandler stole the grab after %d events", dragStoleGrab);
+    QVERIFY(dragStoleGrab > 1);
+    QCOMPARE(handler->active(), true);
+    QCOMPARE(window->rootObject()->property("touchpointPressed").toBool(), false);
+
+    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, point);
+    QCOMPARE(handler->active(), false);
+    QCOMPARE(window->rootObject()->property("touchpointPressed").toBool(), false);
+}
+
 QTEST_MAIN(tst_MptaInterop)
 
 #include "tst_multipointtoucharea_interop.moc"
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp b/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp
index 7636bb38f1..66314f88a2 100644
--- a/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp
+++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp
@@ -54,6 +54,7 @@ private slots:
 
     void defaultPropertyValues();
     void touchDrag();
+    void mouseDrag_data();
     void mouseDrag();
     void dragFromMargin();
     void snapMode_data();
@@ -195,8 +196,22 @@ void tst_DragHandler::touchDrag()
     QCOMPARE(centroidChangedSpy.count(), 5);
 }
 
+void tst_DragHandler::mouseDrag_data()
+{
+    QTest::addColumn<Qt::MouseButtons>("acceptedButtons");
+    QTest::addColumn<Qt::MouseButtons>("dragButton");
+    QTest::newRow("left: drag") << Qt::MouseButtons(Qt::LeftButton) << Qt::MouseButtons(Qt::LeftButton);
+    QTest::newRow("right: don't drag") << Qt::MouseButtons(Qt::LeftButton) << Qt::MouseButtons(Qt::RightButton);
+    QTest::newRow("left: don't drag") << Qt::MouseButtons(Qt::RightButton | Qt::MiddleButton) << Qt::MouseButtons(Qt::LeftButton);
+    QTest::newRow("right or middle: drag") << Qt::MouseButtons(Qt::RightButton | Qt::MiddleButton) << Qt::MouseButtons(Qt::MiddleButton);
+}
+
 void tst_DragHandler::mouseDrag()
 {
+    QFETCH(Qt::MouseButtons, acceptedButtons);
+    QFETCH(Qt::MouseButtons, dragButton);
+    bool shouldDrag = bool(acceptedButtons & dragButton);
+
     const int dragThreshold = QGuiApplication::styleHints()->startDragDistance();
     QScopedPointer<QQuickView> windowPtr;
     createView(windowPtr, "draggables.qml");
@@ -206,6 +221,7 @@ void tst_DragHandler::mouseDrag()
     QVERIFY(ball);
     QQuickDragHandler *dragHandler = ball->findChild<QQuickDragHandler*>();
     QVERIFY(dragHandler);
+    dragHandler->setAcceptedButtons(acceptedButtons); // QTBUG-76875
 
     QSignalSpy translationChangedSpy(dragHandler, SIGNAL(translationChanged()));
     QSignalSpy centroidChangedSpy(dragHandler, SIGNAL(centroidChanged()));
@@ -213,45 +229,57 @@ void tst_DragHandler::mouseDrag()
     QPointF ballCenter = ball->clipRect().center();
     QPointF scenePressPos = ball->mapToScene(ballCenter);
     QPoint p1 = scenePressPos.toPoint();
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, p1);
+    QTest::mousePress(window, static_cast<Qt::MouseButton>(int(dragButton)), Qt::NoModifier, p1);
     QVERIFY(!dragHandler->active());
-    QCOMPARE(dragHandler->centroid().position(), ballCenter);
-    QCOMPARE(dragHandler->centroid().pressPosition(), ballCenter);
-    QCOMPARE(dragHandler->centroid().scenePosition(), scenePressPos);
-    QCOMPARE(dragHandler->centroid().scenePressPosition(), scenePressPos);
-    QCOMPARE(dragHandler->centroid().velocity(), QVector2D());
-    QCOMPARE(centroidChangedSpy.count(), 1);
+    if (shouldDrag) {
+        QCOMPARE(dragHandler->centroid().position(), ballCenter);
+        QCOMPARE(dragHandler->centroid().pressPosition(), ballCenter);
+        QCOMPARE(dragHandler->centroid().scenePosition(), scenePressPos);
+        QCOMPARE(dragHandler->centroid().scenePressPosition(), scenePressPos);
+        QCOMPARE(dragHandler->centroid().velocity(), QVector2D());
+        QCOMPARE(centroidChangedSpy.count(), 1);
+    }
     p1 += QPoint(dragThreshold, 0);
     QTest::mouseMove(window, p1);
-    QTRY_VERIFY(dragHandler->centroid().velocity().x() > 0);
-    QCOMPARE(centroidChangedSpy.count(), 2);
-    QVERIFY(!dragHandler->active());
+    if (shouldDrag) {
+        QTRY_VERIFY(dragHandler->centroid().velocity().x() > 0);
+        QCOMPARE(centroidChangedSpy.count(), 2);
+        QVERIFY(!dragHandler->active());
+    }
     p1 += QPoint(1, 0);
     QTest::mouseMove(window, p1);
-    QTRY_VERIFY(dragHandler->active());
+    if (shouldDrag)
+        QTRY_VERIFY(dragHandler->active());
+    else
+        QVERIFY(!dragHandler->active());
     QCOMPARE(translationChangedSpy.count(), 0);
-    QCOMPARE(centroidChangedSpy.count(), 3);
+    if (shouldDrag)
+        QCOMPARE(centroidChangedSpy.count(), 3);
     QCOMPARE(dragHandler->translation().x(), 0.0);
     QPointF sceneGrabPos = p1;
-    QCOMPARE(dragHandler->centroid().sceneGrabPosition(), sceneGrabPos);
+    if (shouldDrag)
+        QCOMPARE(dragHandler->centroid().sceneGrabPosition(), sceneGrabPos);
     p1 += QPoint(19, 0);
     QTest::mouseMove(window, p1);
-    QTRY_VERIFY(dragHandler->active());
-    QCOMPARE(dragHandler->centroid().position(), ballCenter);
-    QCOMPARE(dragHandler->centroid().pressPosition(), ballCenter);
-    QCOMPARE(dragHandler->centroid().scenePosition(), ball->mapToScene(ballCenter));
-    QCOMPARE(dragHandler->centroid().scenePressPosition(), scenePressPos);
-    QCOMPARE(dragHandler->centroid().sceneGrabPosition(), sceneGrabPos);
-    QCOMPARE(dragHandler->translation().x(), dragThreshold + 20.0);
-    QCOMPARE(dragHandler->translation().y(), 0.0);
-    QVERIFY(dragHandler->centroid().velocity().x() > 0);
-    QCOMPARE(centroidChangedSpy.count(), 4);
-    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, p1);
+    QVERIFY(shouldDrag ? dragHandler->active() : !dragHandler->active());
+    if (shouldDrag) {
+        QCOMPARE(dragHandler->centroid().position(), ballCenter);
+        QCOMPARE(dragHandler->centroid().pressPosition(), ballCenter);
+        QCOMPARE(dragHandler->centroid().scenePosition(), ball->mapToScene(ballCenter));
+        QCOMPARE(dragHandler->centroid().scenePressPosition(), scenePressPos);
+        QCOMPARE(dragHandler->centroid().sceneGrabPosition(), sceneGrabPos);
+        QCOMPARE(dragHandler->translation().x(), dragThreshold + 20.0);
+        QCOMPARE(dragHandler->translation().y(), 0.0);
+        QVERIFY(dragHandler->centroid().velocity().x() > 0);
+        QCOMPARE(centroidChangedSpy.count(), 4);
+    }
+    QTest::mouseRelease(window, static_cast<Qt::MouseButton>(int(dragButton)), Qt::NoModifier, p1);
     QTRY_VERIFY(!dragHandler->active());
     QCOMPARE(dragHandler->centroid().pressedButtons(), Qt::NoButton);
-    QCOMPARE(ball->mapToScene(ballCenter).toPoint(), p1);
-    QCOMPARE(translationChangedSpy.count(), 1);
-    QCOMPARE(centroidChangedSpy.count(), 5);
+    if (shouldDrag)
+        QCOMPARE(ball->mapToScene(ballCenter).toPoint(), p1);
+    QCOMPARE(translationChangedSpy.count(), shouldDrag ? 1 : 0);
+    QCOMPARE(centroidChangedSpy.count(), shouldDrag ? 5 : 0);
 }
 
 void tst_DragHandler::dragFromMargin() // QTBUG-74966
diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml b/tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml
index 221e7df139..042b730799 100644
--- a/tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml
+++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml
@@ -34,6 +34,7 @@ Rectangle {
     property alias pressed: tap.pressed
     property bool checked: false
     property alias gesturePolicy: tap.gesturePolicy
+    property point tappedPosition: Qt.point(0, 0)
     signal tapped
     signal canceled
 
@@ -51,6 +52,7 @@ Rectangle {
         longPressThreshold: 100 // CI can be insanely slow, so don't demand a timely release to generate onTapped
         onTapped: {
             tapFlash.start()
+            root.tappedPosition = point.scenePosition
             root.tapped()
         }
         onCanceled: root.canceled()
diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp b/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp
index 33cea69147..e77ea97518 100644
--- a/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp
+++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp
@@ -107,6 +107,8 @@ void tst_TapHandler::touchGesturePolicyDragThreshold()
 
     QQuickItem *buttonDragThreshold = window->rootObject()->findChild<QQuickItem*>("DragThreshold");
     QVERIFY(buttonDragThreshold);
+    QQuickTapHandler *tapHandler = buttonDragThreshold->findChild<QQuickTapHandler*>();
+    QVERIFY(tapHandler);
     QSignalSpy dragThresholdTappedSpy(buttonDragThreshold, SIGNAL(tapped()));
 
     // DragThreshold button stays pressed while touchpoint stays within dragThreshold, emits tapped on release
@@ -122,6 +124,8 @@ void tst_TapHandler::touchGesturePolicyDragThreshold()
     QQuickTouchUtils::flush(window);
     QTRY_VERIFY(!buttonDragThreshold->property("pressed").toBool());
     QCOMPARE(dragThresholdTappedSpy.count(), 1);
+    QCOMPARE(buttonDragThreshold->property("tappedPosition").toPoint(), p1);
+    QCOMPARE(tapHandler->point().position(), QPointF());
 
     // DragThreshold button is no longer pressed if touchpoint goes beyond dragThreshold
     dragThresholdTappedSpy.clear();
@@ -152,6 +156,8 @@ void tst_TapHandler::mouseGesturePolicyDragThreshold()
 
     QQuickItem *buttonDragThreshold = window->rootObject()->findChild<QQuickItem*>("DragThreshold");
     QVERIFY(buttonDragThreshold);
+    QQuickTapHandler *tapHandler = buttonDragThreshold->findChild<QQuickTapHandler*>();
+    QVERIFY(tapHandler);
     QSignalSpy dragThresholdTappedSpy(buttonDragThreshold, SIGNAL(tapped()));
 
     // DragThreshold button stays pressed while mouse stays within dragThreshold, emits tapped on release
@@ -164,6 +170,8 @@ void tst_TapHandler::mouseGesturePolicyDragThreshold()
     QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, p1);
     QTRY_VERIFY(!buttonDragThreshold->property("pressed").toBool());
     QTRY_COMPARE(dragThresholdTappedSpy.count(), 1);
+    QCOMPARE(buttonDragThreshold->property("tappedPosition").toPoint(), p1);
+    QCOMPARE(tapHandler->point().position(), QPointF());
 
     // DragThreshold button is no longer pressed if mouse goes beyond dragThreshold
     dragThresholdTappedSpy.clear();
diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
index 65a08ce87f..2314b82e8c 100644
--- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
+++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
@@ -1652,6 +1652,7 @@ void tst_qquickflickable::flickTwiceUsingTouches()
     QQuickViewTestUtil::moveMouseAway(window.data());
     window->show();
     QVERIFY(window->rootObject() != nullptr);
+    QVERIFY(QTest::qWaitForWindowActive(window.data()));
 
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
     QVERIFY(flickable != nullptr);
@@ -1994,6 +1995,7 @@ void tst_qquickflickable::nestedMouseAreaUsingTouch()
     QQuickViewTestUtil::moveMouseAway(window.data());
     window->show();
     QVERIFY(window->rootObject() != nullptr);
+    QVERIFY(QTest::qWaitForWindowActive(window.data()));
 
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
     QVERIFY(flickable != nullptr);
@@ -2489,6 +2491,7 @@ void tst_qquickflickable::synchronousDrag()
     QQuickViewTestUtil::moveMouseAway(window);
     window->show();
     QVERIFY(window->rootObject() != nullptr);
+    QVERIFY(QTest::qWaitForWindowActive(window));
 
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
     QVERIFY(flickable != nullptr);
diff --git a/tests/auto/quick/qquicklistview/data/resizeAfterComponentComplete.qml b/tests/auto/quick/qquicklistview/data/resizeAfterComponentComplete.qml
new file mode 100644
index 0000000000..851d8f9a0c
--- /dev/null
+++ b/tests/auto/quick/qquicklistview/data/resizeAfterComponentComplete.qml
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** 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.12
+
+ListView {
+    id: listView
+    property var lastItem
+    anchors.fill: parent
+    model: 10
+    delegate: Rectangle {
+        width: parent.width
+        height: 40
+        border.color: "lightsteelblue"
+        Text {
+            text: "Item" + (index + 1)
+        }
+        Component.onCompleted: {
+            if (index == 9)
+                listView.lastItem = this
+        }
+    }
+
+    populate: Transition {
+        NumberAnimation {
+            properties: "x,y"
+            duration: 1000
+        }
+    }
+}
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index f14a6e75f6..bab2ec34f8 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -278,6 +278,7 @@ private slots:
     void addOnCompleted();
     void setPositionOnLayout();
     void touchCancel();
+    void resizeAfterComponentComplete();
 
 private:
     template <class T> void items(const QUrl &source);
@@ -9020,6 +9021,21 @@ void tst_QQuickListView::touchCancel() // QTBUG-74679
     QTRY_COMPARE(listview->contentY(), 500.0);
 }
 
+void tst_QQuickListView::resizeAfterComponentComplete()  // QTBUG-76487
+{
+    QScopedPointer<QQuickView> window(createView());
+    window->setSource(testFileUrl("resizeAfterComponentComplete.qml"));
+    window->resize(640, 480);
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
+
+    QObject *listView = window->rootObject();
+    QVERIFY(listView);
+
+    QObject *lastItem = qvariant_cast<QObject *>(listView->property("lastItem"));
+    QTRY_COMPARE(lastItem->property("y").toInt(), 9 * lastItem->property("height").toInt());
+}
+
 QTEST_MAIN(tst_QQuickListView)
 
 #include "tst_qquicklistview.moc"
diff --git a/tests/auto/quick/qquickshape/data/pathitem8.png b/tests/auto/quick/qquickshape/data/pathitem8.png
new file mode 100644
index 0000000000..ee585958ec
--- /dev/null
+++ b/tests/auto/quick/qquickshape/data/pathitem8.png
diff --git a/tests/auto/quick/qquickshape/data/pathitem8.qml b/tests/auto/quick/qquickshape/data/pathitem8.qml
new file mode 100644
index 0000000000..9789ff90e0
--- /dev/null
+++ b/tests/auto/quick/qquickshape/data/pathitem8.qml
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** 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:GPL-EXCEPT$
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.14
+import QtQuick.Shapes 1.14
+
+Item {
+    id: item
+    width: 200
+    height: 150
+
+    Shape {
+        vendorExtensionsEnabled: false
+        objectName: "shape"
+        id: shape
+        anchors.fill: parent
+
+        ShapePath {
+            strokeWidth: 4
+            strokeColor: "red"
+            scale: Qt.size(shape.width - 1, shape.height - 1)
+            fillGradient: LinearGradient {
+                x1: 20; y1: 20
+                x2: 180; y2: 130
+                GradientStop { position: 0; color: "blue" }
+                GradientStop { position: 0.2; color: "green" }
+                GradientStop { position: 0.4; color: "red" }
+                GradientStop { position: 0.6; color: "yellow" }
+                GradientStop { position: 1; color: "cyan" }
+            }
+            strokeStyle: ShapePath.DashLine
+            dashPattern: [ 1, 4 ]
+            PathMultiline {
+                paths: [[Qt.point(20.0  / (item.width - 1.0), 20.0  / (item.height - 1.0)),
+                         Qt.point(180.0 / (item.width - 1.0), 130.0 / (item.height - 1.0)),
+                         Qt.point(20.0  / (item.width - 1.0), 130.0 / (item.height - 1.0)),
+                         Qt.point(20.0  / (item.width - 1.0), 20.0  / (item.height - 1.0)) ],
+                        [Qt.point( 0.45 , 0.67 ),
+                         Qt.point( 0.414906666468 , 0.573581858547 ),
+                         Qt.point( 0.32604722665 , 0.522278837048 ),
+                         Qt.point( 0.225 , 0.540096189432 ),
+                         Qt.point( 0.159046106882 , 0.618696978501 ),
+                         Qt.point( 0.159046106882 , 0.721303021499 ),
+                         Qt.point( 0.225 , 0.799903810568 ),
+                         Qt.point( 0.32604722665 , 0.817721162952 ),
+                         Qt.point( 0.414906666468 , 0.766418141453 ),
+                         Qt.point( 0.45 , 0.67 ),
+                        ],
+                        [Qt.point( 0.69 , 0.75 ),
+                         Qt.point( 0.668943999881 , 0.692149115128 ),
+                         Qt.point( 0.61562833599 , 0.661367302229 ),
+                         Qt.point( 0.555 , 0.672057713659 ),
+                         Qt.point( 0.515427664129 , 0.719218187101 ),
+                         Qt.point( 0.515427664129 , 0.780781812899 ),
+                         Qt.point( 0.555 , 0.827942286341 ),
+                         Qt.point( 0.61562833599 , 0.838632697771 ),
+                         Qt.point( 0.668943999881 , 0.807850884872 ),
+                         Qt.point( 0.69 , 0.75 ),
+                        ]]
+            }
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickshape/tst_qquickshape.cpp b/tests/auto/quick/qquickshape/tst_qquickshape.cpp
index 174ada65a5..b3b8d2d148 100644
--- a/tests/auto/quick/qquickshape/tst_qquickshape.cpp
+++ b/tests/auto/quick/qquickshape/tst_qquickshape.cpp
@@ -59,6 +59,7 @@ private slots:
     void radialGrad();
     void conicalGrad();
     void renderPolyline();
+    void renderMultiline();
 };
 
 tst_QQuickShape::tst_QQuickShape()
@@ -343,6 +344,35 @@ void tst_QQuickShape::renderPolyline()
     QVERIFY2(res, qPrintable(errorMessage));
 }
 
+void tst_QQuickShape::renderMultiline()
+{
+    QScopedPointer<QQuickView> window(createView());
+
+    window->setSource(testFileUrl("pathitem8.qml"));
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
+
+    if ((QGuiApplication::platformName() == QLatin1String("offscreen"))
+        || (QGuiApplication::platformName() == QLatin1String("minimal")))
+        QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimimal platforms", Abort);
+
+    QImage img = window->grabWindow();
+    QVERIFY(!img.isNull());
+
+    QImage refImg(testFileUrl("pathitem8.png").toLocalFile());
+    QVERIFY(!refImg.isNull());
+
+    QString errorMessage;
+    const QImage actualImg = img.convertToFormat(refImg.format());
+    const bool res = QQuickVisualTestUtil::compareImages(actualImg, refImg, &errorMessage);
+    if (!res) { // For visual inspection purposes.
+        QTest::qWait(5000);
+        const QString &tempLocation = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
+        actualImg.save(tempLocation + QLatin1String("/pathitem8.png"));
+    }
+    QVERIFY2(res, qPrintable(errorMessage));
+}
+
 QTEST_MAIN(tst_QQuickShape)
 
 #include "tst_qquickshape.moc"
diff --git a/tests/auto/quick/qquicktext/BLACKLIST b/tests/auto/quick/qquicktext/BLACKLIST
index 6c3c3af154..594f9af3b3 100644
--- a/tests/auto/quick/qquicktext/BLACKLIST
+++ b/tests/auto/quick/qquicktext/BLACKLIST
@@ -4,3 +4,5 @@ qemu
 osx-10.12
 [fontSizeMode]
 opensuse-42.1
+[contentSize]
+windows gcc