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, 1 insertions, 18 deletions

diff --git a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_2.qml
index 160b89168e..64b950ace4 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_2.qml
@@ -43,23 +43,6 @@ Item {
         property variant offset: Qt.size(4 / width, 4 / height)
         property variant delta: Qt.size(0.5 / width, 0.5 / height)
 
-        fragmentShader: "
-            uniform lowp sampler2D source;
-            uniform highp vec2 offset;
-            uniform highp vec2 delta;
-            varying highp vec2 qt_TexCoord0;
-            uniform lowp float qt_Opacity;
-            void main() {
-                highp vec2 delta2 = vec2(delta.x, -delta.y);
-                lowp float shadow = 0.25 * (texture2D(source, qt_TexCoord0 - offset + delta).a
-                                  + texture2D(source, qt_TexCoord0 - offset - delta).a
-                                  + texture2D(source, qt_TexCoord0 - offset + delta2).a
-                                  + texture2D(source, qt_TexCoord0 - offset - delta2).a);
-                lowp vec4 color = texture2D(source, qt_TexCoord0);
-                gl_FragColor = mix(vec4(vec3(0.), 0.5 * shadow), color, color.a);
-            }
-            "
+        fragmentShader: "qrc:shaders/shadow.frag"
     }
 }
-
-