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

 Conflicts:
	src/qml/common/qv4compileddata_p.h
	tests/auto/qml/qmlmin/tst_qmlmin.cpp

Change-Id: Ieabc9e0729630de6a8644024d11b765f35199f29

3 files changed, 7 insertions, 74 deletions

diff --git a/tests/manual/pointer/sidebar.qml b/tests/manual/pointer/sidebar.qml
index 827dbd1980..b7370a4fb7 100644
--- a/tests/manual/pointer/sidebar.qml
+++ b/tests/manual/pointer/sidebar.qml
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
+import QtQuick 2.15
 import "content"
 
 Rectangle {
@@ -53,6 +53,7 @@ Rectangle {
                     id: buttonMA
                     objectName: "buttonMA"
                     hoverEnabled: true
+                    cursorShape: Qt.UpArrowCursor
                     anchors.fill: parent
                     onClicked: console.log("clicked MA")
                 }
@@ -75,9 +76,11 @@ Rectangle {
                     id: buttonHH
                     objectName: "buttonHH"
                     acceptedDevices: PointerDevice.AllDevices
+                    cursorShape: tapHandler.pressed ? Qt.BusyCursor : Qt.PointingHandCursor
                 }
 
                 TapHandler {
+                    id: tapHandler
                     onTapped: tapFlash.start()
                 }
 
@@ -148,6 +151,7 @@ Rectangle {
         HoverHandler {
             id: topSidebarHH
             objectName: "topSidebarHH"
+            cursorShape: Qt.OpenHandCursor
         }
 
         Loader {
@@ -173,6 +177,7 @@ Rectangle {
             id: bottomSidebarMA
             objectName: "bottomSidebarMA"
             hoverEnabled: true
+            cursorShape: Qt.ClosedHandCursor
             anchors.fill: parent
         }
 
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/attributes.qml b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/attributes.qml
deleted file mode 100644
index 17d9aadf95..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/attributes.qml
+++ /dev/null
@@ -1,65 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
-    width: 320
-    height: 480
-
-    Text {
-        id: text
-        font.pixelSize:  80
-        text: "Shaderz!"
-    }
-
-    ShaderEffectSource {
-        id: source
-        sourceItem: text
-        hideSource: true
-        smooth: true
-    }
-    Column {
-        ShaderEffect {
-            width: 320
-            height: 160
-            property variant source: source
-            vertexShader: "
-                uniform highp mat4 qt_Matrix;
-                attribute highp vec4 qt_Vertex;
-                attribute highp vec2 qt_MultiTexCoord0;
-                varying highp vec2 qt_TexCoord0;
-                void main() {
-                    gl_Position = qt_Matrix * qt_Vertex;
-                    qt_TexCoord0 = qt_MultiTexCoord0;
-                }"
-        }
-        ShaderEffect {
-            width: 320
-            height: 160
-            property variant source: source
-            vertexShader: "
-                attribute highp vec2 qt_MultiTexCoord0;
-                uniform highp mat4 qt_Matrix;
-                attribute highp vec4 qt_Vertex;
-                varying highp vec2 qt_TexCoord0;
-                void main() {
-                    gl_Position = qt_Matrix * qt_Vertex;
-                    qt_TexCoord0 = qt_MultiTexCoord0;
-                }"
-        }
-        ShaderEffect {
-            width: 320
-            height: 160
-            property variant source: source
-            vertexShader: "
-                attribute highp vec2 qt_MultiTexCoord0;
-                uniform highp mat4 qt_Matrix;
-                attribute highp vec4 qt_Vertex;
-                varying highp vec2 qt_TexCoord0;
-                uniform highp float width;
-                uniform highp float height;
-                void main() {
-                    gl_Position = qt_Matrix * qt_Vertex;
-                    qt_TexCoord0 = qt_Vertex.xy / vec2(width, height);
-                }"
-        }
-    }
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/switch_3.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/switch_3.qml
index 0d3c1fc4ee..c02dfba9e2 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/switch_3.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/switch_3.qml
@@ -47,14 +47,7 @@ Item {
 
         property variant source: source
 
-        fragmentShader: "
-        uniform lowp sampler2D source;
-        varying highp vec2 qt_TexCoord0;
-        uniform lowp float qt_Opacity;
-        void main() {
-            gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1) * texture2D(source, qt_TexCoord0).a;
-        }
-        "
+        fragmentShader: "qrc:shaders/gradient.frag"
     }