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

 Conflicts:
	src/imports/folderlistmodel/plugin.cpp
	src/imports/layouts/plugin.cpp
	src/imports/localstorage/plugin.cpp
	src/imports/models/plugin.cpp
	src/imports/particles/plugin.cpp
	src/imports/qtqml/plugin.cpp
	src/imports/qtquick2/plugin.cpp
	src/imports/shapes/plugin.cpp
	src/imports/statemachine/plugin.cpp
	src/imports/testlib/main.cpp
	src/imports/wavefrontmesh/plugin.cpp
	src/imports/window/plugin.cpp
	src/imports/workerscript/plugin.cpp
	src/qml/jsruntime/qv4sequenceobject.cpp
	src/qml/qml/qqmlengine.cpp
	src/qmlmodels/qqmlmodelsmodule.cpp
	src/qmlmodels/qqmlmodelsmodule_p.h
	src/qmlworkerscript/qqmlworkerscriptmodule.cpp
	src/qmlworkerscript/qqmlworkerscriptmodule_p.h
	src/quick/items/qquickitemsmodule.cpp

Change-Id: I5f1fbc3d00e8f583d2c89afc5389de84d68633a7

1 files changed, 3 insertions, 14 deletions

diff --git a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_16.qml b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_16.qml
index 971cda4f55..9e221d0887 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_16.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_16.qml
@@ -6,8 +6,8 @@ Rectangle {
     color: "skyblue"
     ShaderEffect {
         anchors.centerIn: parent
-        width: 16 * 16
-        height: 24 * 16
+        width: 22 * 12
+        height: 16 * 12
         property variant source: ShaderEffectSource {
             sourceItem: Rectangle {
                 width: 22 * 20
@@ -40,18 +40,7 @@ Rectangle {
             }
             smooth: true
         }
-        vertexShader: "
-            uniform highp mat4 qt_Matrix;
-            attribute highp vec4 qt_Vertex;
-            attribute highp vec2 qt_MultiTexCoord0;
-            varying highp vec2 qt_TexCoord0;
-            void main() {
-                highp vec4 pos = qt_Vertex;
-                pos.x += sin(qt_Vertex.y * 0.02) * 20.;
-                pos.y += sin(qt_Vertex.x * 0.02) * 20.;
-                gl_Position = qt_Matrix * pos;
-                qt_TexCoord0 = qt_MultiTexCoord0;
-            }"
+        vertexShader: "qrc:shaders/wave.vert"
         mesh: GridMesh {
             property int r: 16
             resolution: Qt.size(r, r)