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

 Conflicts:
	src/3rdparty/masm/yarr/YarrJIT.cpp
	src/qml/compiler/qv4instr_moth.cpp
	src/quick/handlers/qquicksinglepointhandler_p.h
	src/quick/handlers/qquicktaphandler.cpp
	src/quick/items/context2d/qquickcontext2d.cpp

Done-With: Ulf Hermann <ulf.hermann@qt.io>
Change-Id: I109453131f9f0a05316ae37c7d6ed1edc8c0f9d4

1 files changed, 73 insertions, 0 deletions

diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/data/tapOnList.qml b/tests/auto/quick/pointerhandlers/flickableinterop/data/tapOnList.qml
new file mode 100644
index 0000000000..ef27955043
--- /dev/null
+++ b/tests/auto/quick/pointerhandlers/flickableinterop/data/tapOnList.qml
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** 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
+
+ListView {
+    id: root
+    objectName: "root"
+    property Item buttonUnderTest: null
+    property Item delegateUnderTest: null
+    width: 800
+    height: 480
+    model: 10
+    spacing: 2
+
+    delegate: Rectangle {
+        objectName: "itemview delegate"
+        color: delegateTap.pressed ? "wheat" : "beige"
+        width: parent.width; height: 140
+        Rectangle {
+            objectName: "button"
+            anchors.centerIn: parent
+            border.color: "tomato"
+            border.width: 10
+            color: innerTap.pressed ? "goldenrod" : "beige"
+            width: 100
+            height: 100
+            TapHandler {
+                id: innerTap
+                objectName: "buttonTap"
+            }
+            Component.onCompleted: if (!root.buttonUnderTest) {
+                root.buttonUnderTest = this
+                root.delegateUnderTest = parent
+            }
+        }
+        TapHandler {
+            id: delegateTap
+            objectName: "delegateTap"
+        }
+    }
+
+    TapHandler {
+        objectName: "contentItemTap"
+    }
+
+    Component.onCompleted: contentItem.objectName = "ListView's contentItem"
+}