Use build time shader compilation in lancelot tests

Clean up the remains of Qt 5 shaders, and use the simpler Qt 6 way of
adding shaders to the app.

Change-Id: Ibbdf7ada899507705a2709913410b24d476d25d3
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 0b1c7c95e08d1ef0165ff9237c194cfcebdcefce)
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

90 files changed, 246 insertions, 475 deletions

diff --git a/tests/manual/scenegraph_lancelot/data/shaders/activity/activity.qml b/tests/manual/scenegraph_lancelot/data/shaders/activity/activity.qml
index 956b3d7d91..0a0f956af1 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/activity/activity.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/activity/activity.qml
@@ -23,6 +23,6 @@ Item {
 
         property variant source: source
 
-        fragmentShader: "qrc:shaders/gradient.frag"
+        fragmentShader: "qrc:shaders/gradient.frag.qsb"
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/atlas/atlas.qml b/tests/manual/scenegraph_lancelot/data/shaders/atlas/atlas.qml
index 06c254253e..67e9dafff3 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/atlas/atlas.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/atlas/atlas.qml
@@ -22,7 +22,7 @@ Item {
                     width: img.width
                     height: img.height
                     property variant source: img
-                    fragmentShader: "qrc:shaders/gradientgrid.frag"
+                    fragmentShader: "qrc:shaders/gradientgrid.frag.qsb"
                     supportsAtlasTextures: false
                 }
 
@@ -31,7 +31,7 @@ Item {
                     width: img.width
                     height: img.height
                     property variant source: img
-                    fragmentShader: "qrc:shaders/gradientgrid.frag"
+                    fragmentShader: "qrc:shaders/gradientgrid.frag.qsb"
                     supportsAtlasTextures: true
                 }
 
@@ -41,8 +41,8 @@ Item {
                     width: img.width
                     height: img.height
                     property variant source: img
-                    fragmentShader: "qrc:shaders/gradientgrid.frag"
-                    vertexShader: "qrc:shaders/subrect.vert"
+                    fragmentShader: "qrc:shaders/gradientgrid.frag.qsb"
+                    vertexShader: "qrc:shaders/subrect.vert.qsb"
                     supportsAtlasTextures: false
                 }
             }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/basic/basic.qml b/tests/manual/scenegraph_lancelot/data/shaders/basic/basic.qml
index 24aa5db5e8..e0026c1412 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/basic/basic.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/basic/basic.qml
@@ -6,6 +6,6 @@ Item {
 
     ShaderEffect {
         anchors.fill: parent;
-        fragmentShader: "qrc:shaders/basic.frag"
+        fragmentShader: "qrc:shaders/basic.frag.qsb"
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/basic/basic_alpha.qml b/tests/manual/scenegraph_lancelot/data/shaders/basic/basic_alpha.qml
index 1bd7d0903b..76db704806 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/basic/basic_alpha.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/basic/basic_alpha.qml
@@ -17,7 +17,7 @@ Item {
         y: 10
         width: 300
         height: 200
-        fragmentShader: "qrc:shaders/basic_alpha.frag"
+        fragmentShader: "qrc:shaders/basic_alpha.frag.qsb"
         blending: true
     }
 
@@ -26,7 +26,7 @@ Item {
         y: 250
         width: 300
         height: 200
-        fragmentShader: "qrc:shaders/basic_alpha.frag"
+        fragmentShader: "qrc:shaders/basic_alpha.frag.qsb"
         blending: false
     }
 
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_1.qml
index 118de56098..f60c5f7aa8 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_1.qml
@@ -72,7 +72,7 @@ Rectangle {
                     cullMode: model.bar
                     property variant frontSource: front
                     property variant backSource: back
-                    fragmentShader: "qrc:shaders/culling.frag"
+                    fragmentShader: "qrc:shaders/culling.frag.qsb"
                     transform: Rotation {
                         origin.x: 200
                         origin.y: 180 - 120 * index
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml
index 7614451e05..43254dd044 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/culling/culling_2.qml
@@ -72,7 +72,7 @@ Rectangle {
                     cullMode: model.bar
                     property variant frontSource: front
                     property variant backSource: back
-                    fragmentShader: "qrc:shaders/culling.frag"
+                    fragmentShader: "qrc:shaders/culling.frag.qsb"
                     transform: Rotation {
                         origin.x: 100
                         origin.y: 180 - 120 * index
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml
index 7a743453ab..8546a4bb0b 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_1.qml
@@ -40,7 +40,7 @@ Rectangle {
             }
             smooth: true
         }
-        vertexShader: "qrc:shaders/wave.vert"
+        vertexShader: "qrc:shaders/wave.vert.qsb"
         mesh: GridMesh {
             property int r: 1
             resolution: Qt.size(r, r)
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 9e221d0887..2d92c4a025 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_16.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_16.qml
@@ -40,7 +40,7 @@ Rectangle {
             }
             smooth: true
         }
-        vertexShader: "qrc:shaders/wave.vert"
+        vertexShader: "qrc:shaders/wave.vert.qsb"
         mesh: GridMesh {
             property int r: 16
             resolution: Qt.size(r, r)
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_2.qml
index 4dad42d182..24ba2b6650 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_2.qml
@@ -40,7 +40,7 @@ Rectangle {
             }
             smooth: true
         }
-        vertexShader: "qrc:shaders/wave.vert"
+        vertexShader: "qrc:shaders/wave.vert.qsb"
         mesh: GridMesh {
             property int r: 2
             resolution: Qt.size(r, r)
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_4.qml b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_4.qml
index 9d91da0bb2..f1f31e6f90 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_4.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_4.qml
@@ -40,7 +40,7 @@ Rectangle {
             }
             smooth: true
         }
-        vertexShader: "qrc:shaders/wave.vert"
+        vertexShader: "qrc:shaders/wave.vert.qsb"
         mesh: GridMesh {
             property int r: 4
             resolution: Qt.size(r, r)
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_8.qml b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_8.qml
index c436c0f8e4..bd7fee50a4 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_8.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/gridmesh/resolution_8.qml
@@ -40,7 +40,7 @@ Rectangle {
             }
             smooth: true
         }
-        vertexShader: "qrc:shaders/wave.vert"
+        vertexShader: "qrc:shaders/wave.vert.qsb"
         mesh: GridMesh {
             property int r: 8
             resolution: Qt.size(r, r)
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_1.qml
index 7c5b5efac5..ef16489282 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_1.qml
@@ -43,6 +43,6 @@ Item {
         property variant offset: Qt.size(4 / width, 4 / height)
         property variant delta: Qt.size(0.5 / width, 0.5 / height)
 
-        fragmentShader: "qrc:shaders/shadow.frag"
+        fragmentShader: "qrc:shaders/shadow.frag.qsb"
     }
 }
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 64b950ace4..ca08a124fd 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/hiddensource_2.qml
@@ -43,6 +43,6 @@ Item {
         property variant offset: Qt.size(4 / width, 4 / height)
         property variant delta: Qt.size(0.5 / width, 0.5 / height)
 
-        fragmentShader: "qrc:shaders/shadow.frag"
+        fragmentShader: "qrc:shaders/shadow.frag.qsb"
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_1.qml
index b071715cf2..bd9d534624 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_1.qml
@@ -43,6 +43,6 @@ Item {
         property variant offset: Qt.size(4 / width, 4 / height)
         property variant delta: Qt.size(0.5 / width, 0.5 / height)
 
-        fragmentShader: "qrc:shaders/shadow.frag"
+        fragmentShader: "qrc:shaders/shadow.frag.qsb"
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_2.qml
index 02ac70e69c..00cec276dc 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/hiddensource/unhidden_2.qml
@@ -43,6 +43,6 @@ Item {
         property variant offset: Qt.size(4 / width, 4 / height)
         property variant delta: Qt.size(0.5 / width, 0.5 / height)
 
-        fragmentShader: "qrc:shaders/shadow.frag"
+        fragmentShader: "qrc:shaders/shadow.frag.qsb"
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/image/async.qml b/tests/manual/scenegraph_lancelot/data/shaders/image/async.qml
index c4cf4cc1e4..79f2642c6d 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/image/async.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/image/async.qml
@@ -14,7 +14,7 @@ Item {
     ShaderEffect {
         anchors.fill: image
         property variant source: image
-        fragmentShader: "qrc:shaders/gradient2.frag"
+        fragmentShader: "qrc:shaders/gradient2.frag.qsb"
         visible: image.status == Image.Ready
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/image/source.qml b/tests/manual/scenegraph_lancelot/data/shaders/image/source.qml
index 04406829b3..e3150cd085 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/image/source.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/image/source.qml
@@ -13,6 +13,6 @@ Item {
     ShaderEffect {
         anchors.fill: image
         property variant source: image
-        fragmentShader: "qrc:shaders/gradient2.frag"
+        fragmentShader: "qrc:shaders/gradient2.frag.qsb"
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/layer/layer.qml b/tests/manual/scenegraph_lancelot/data/shaders/layer/layer.qml
index 4f9a2a4fc3..0e591ea0e8 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/layer/layer.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/layer/layer.qml
@@ -18,6 +18,6 @@ Item {
     layer.enabled: true
     layer.samplerName: "source"
     layer.effect: ShaderEffect {
-        fragmentShader: "qrc:shaders/desaturate.frag"
+        fragmentShader: "qrc:shaders/desaturate.frag.qsb"
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_1.qml
index 97b5760854..99801e83b4 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_1.qml
@@ -32,6 +32,6 @@ Item {
 
         property variant source: source
 
-        fragmentShader: "qrc:shaders/gradient3.frag"
+        fragmentShader: "qrc:shaders/gradient3.frag.qsb"
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_2.qml
index ea3456838c..9bfde80098 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/live/liveonce_2.qml
@@ -32,6 +32,6 @@ Item {
 
         property variant source: source
 
-        fragmentShader: "qrc:shaders/gradient3.frag"
+        fragmentShader: "qrc:shaders/gradient3.frag.qsb"
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_1.qml
index 9f0162ccd3..b99c0b66d5 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_1.qml
@@ -38,7 +38,7 @@ Item {
 
         property variant source: source1
 
-        fragmentShader: "qrc:shaders/gradient4.frag"
+        fragmentShader: "qrc:shaders/gradient4.frag.qsb"
     }
 
     ShaderEffect {
@@ -48,7 +48,7 @@ Item {
 
         property variant source: source2
 
-        fragmentShader: "qrc:shaders/gradient3.frag"
+        fragmentShader: "qrc:shaders/gradient3.frag.qsb"
     }
 }
 
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_2.qml
index e0c218ca69..366c57428c 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/live/livetwice_2.qml
@@ -38,7 +38,7 @@ Item {
 
         property variant source: source1
 
-        fragmentShader: "qrc:shaders/gradient4.frag"
+        fragmentShader: "qrc:shaders/gradient4.frag.qsb"
     }
 
     ShaderEffect {
@@ -48,7 +48,7 @@ Item {
 
         property variant source: source2
 
-        fragmentShader: "qrc:shaders/gradient3.frag"
+        fragmentShader: "qrc:shaders/gradient3.frag.qsb"
     }
 }
 
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/live/samesource.qml b/tests/manual/scenegraph_lancelot/data/shaders/live/samesource.qml
index 5b1f15c01c..f7cd8e3387 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/live/samesource.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/live/samesource.qml
@@ -24,7 +24,7 @@ Item {
 
         property variant source: source
 
-        fragmentShader: "qrc:shaders/gradient3.frag"
+        fragmentShader: "qrc:shaders/gradient3.frag.qsb"
     }
 
     ShaderEffect {
@@ -34,6 +34,6 @@ Item {
 
         property variant source: source
 
-        fragmentShader: "qrc:shaders/gradient5.frag"
+        fragmentShader: "qrc:shaders/gradient5.frag.qsb"
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/property.qml b/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/property.qml
index c58380aca8..5978564247 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/property.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/property.qml
@@ -10,7 +10,7 @@ Item {
         width: 300
         height: 200
         property real colorProperty: 0.5
-        fragmentShader: "qrc:shaders/property.frag"
+        fragmentShader: "qrc:shaders/property.frag.qsb"
     }
 
     ShaderEffect {
@@ -19,7 +19,7 @@ Item {
         width: 300
         height: 200
         property real colorProperty: 0.0
-        fragmentShader: "qrc:shaders/property.frag"
+        fragmentShader: "qrc:shaders/property.frag.qsb"
 
         NumberAnimation on colorProperty {
             duration: 200
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator.qml b/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator.qml
index 3e98088d81..006fc12526 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator.qml
@@ -10,7 +10,7 @@ Item {
         width: 300
         height: 200
         property real colorProperty: 0.0
-        fragmentShader: "qrc:shaders/property.frag"
+        fragmentShader: "qrc:shaders/property.frag.qsb"
 
         UniformAnimator on colorProperty {
             duration: 20
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator_stall.qml b/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator_stall.qml
index e62c64e3ae..ed5c7ce2c1 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator_stall.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/uniformanimator_stall.qml
@@ -21,7 +21,7 @@ Item {
         width: 200
         height: 200
         property real colorProperty: 0.0
-        fragmentShader: "qrc:shaders/property.frag"
+        fragmentShader: "qrc:shaders/property.frag.qsb"
         UniformAnimator {
             id: animator
             target: shader
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/one-source.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/one-source.qml
index 309db50ba2..5f963dd54a 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/one-source.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/one-source.qml
@@ -23,6 +23,6 @@ Item {
 
         property variant source: source
 
-        fragmentShader: "qrc:shaders/gradient.frag"
+        fragmentShader: "qrc:shaders/gradient.frag.qsb"
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml
index 75a0d2a151..863bff683d 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml
@@ -31,7 +31,7 @@ Item {
                 sourceItem: text
                 sourceRect: Qt.rect(x0 - text.x, y0 - text.y, w, h)
             }
-            fragmentShader: "qrc:shaders/gradient.frag"
+            fragmentShader: "qrc:shaders/gradient.frag.qsb"
         }
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/switch_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/switch_1.qml
index 2b04b76482..c4252bbc94 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/switch_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/switch_1.qml
@@ -47,7 +47,7 @@ Item {
 
         property variant source: source
 
-        fragmentShader: "qrc:shaders/gradient.frag"
+        fragmentShader: "qrc:shaders/gradient.frag.qsb"
     }
 
 
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/switch_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/switch_2.qml
index 0ce09cda18..a6ebcb6325 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/switch_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/switch_2.qml
@@ -47,7 +47,7 @@ Item {
 
         property variant source: source
 
-        fragmentShader: "qrc:shaders/gradient.frag"
+        fragmentShader: "qrc:shaders/gradient.frag.qsb"
     }
 
 
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 c02dfba9e2..fabf818c93 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/switch_3.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/switch_3.qml
@@ -47,7 +47,7 @@ Item {
 
         property variant source: source
 
-        fragmentShader: "qrc:shaders/gradient.frag"
+        fragmentShader: "qrc:shaders/gradient.frag.qsb"
     }
 
 
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/two-sources.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/two-sources.qml
index dbb82a278e..e20d335220 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/two-sources.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/two-sources.qml
@@ -44,6 +44,6 @@ Item {
         property variant colorSource: colorSource
         property variant maskSource: maskSource;
 
-        fragmentShader: "qrc:shaders/stencil.frag"
+        fragmentShader: "qrc:shaders/stencil.frag.qsb"
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/visible_1.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/visible_1.qml
index 309028807f..32625baecf 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/visible_1.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/visible_1.qml
@@ -27,6 +27,6 @@ Item {
 
         property variant source: source
 
-        fragmentShader: "qrc:shaders/gradient.frag"
+        fragmentShader: "qrc:shaders/gradient.frag.qsb"
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/visible_2.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/visible_2.qml
index df05c8f087..0aad070391 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/visible_2.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/visible_2.qml
@@ -27,6 +27,6 @@ Item {
 
         property variant source: source
 
-        fragmentShader: "qrc:shaders/gradient.frag"
+        fragmentShader: "qrc:shaders/gradient.frag.qsb"
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/texture/size.qml b/tests/manual/scenegraph_lancelot/data/shaders/texture/size.qml
index 5738da5e8d..d97a5859ab 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/texture/size.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/texture/size.qml
@@ -18,7 +18,7 @@ Item {
         property variant textureSize: source.textureSize
         property color color: "black"
 
-        fragmentShader: "qrc:shaders/edge.frag"
+        fragmentShader: "qrc:shaders/edge.frag.qsb"
     }
 
     Text {
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/wrap/modes.qml b/tests/manual/scenegraph_lancelot/data/shaders/wrap/modes.qml
index baa002dc50..70fcef1f3a 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/wrap/modes.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/wrap/modes.qml
@@ -48,6 +48,6 @@ Item {
         property variant yellow: repeat
         property variant black: clamp
 
-        fragmentShader: "qrc:shaders/cmyk.frag"
+        fragmentShader: "qrc:shaders/cmyk.frag.qsb"
     }
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic.frag
deleted file mode 100644
index 15459ffdb9..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic.frag
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic_alpha.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic_alpha.frag
deleted file mode 100644
index 277d07f7ae..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/basic_alpha.frag
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/cmyk.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/cmyk.frag
deleted file mode 100644
index 5ef0333b6b..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/cmyk.frag
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/culling.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/culling.frag
deleted file mode 100644
index 97a021fe3e..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/culling.frag
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/desaturate.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/desaturate.frag
deleted file mode 100644
index 42a11de194..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/desaturate.frag
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/edge.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/edge.frag
deleted file mode 100644
index aecaa621ef..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/edge.frag
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient.frag
deleted file mode 100644
index ef7a9c10ca..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient.frag
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient2.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient2.frag
deleted file mode 100644
index ca58580786..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient2.frag
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient3.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient3.frag
deleted file mode 100644
index e1fc8b0ce8..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient3.frag
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient4.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient4.frag
deleted file mode 100644
index 2e0b809d7d..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient4.frag
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient5.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient5.frag
deleted file mode 100644
index 106c2c5515..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradient5.frag
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradientgrid.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradientgrid.frag
deleted file mode 100644
index 56bcd200fe..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/gradientgrid.frag
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/property.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/property.frag
deleted file mode 100644
index 078252cad4..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/property.frag
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/shadow.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/shadow.frag
deleted file mode 100644
index 788a047ab0..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/shadow.frag
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/stencil.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/stencil.frag
deleted file mode 100644
index e3907a90d2..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/stencil.frag
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/subrect.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/subrect.vert
deleted file mode 100644
index 623df9a177..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/subrect.vert
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/wave.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/wave.vert
deleted file mode 100644
index 14cb4e768f..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/+qsb/wave.vert
+++ /dev/null
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic.frag
index 6b3a881174..aa850af449 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic.frag
@@ -1,5 +1,8 @@
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
 void main() {
-    gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1);
+    fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1);
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha.frag
index e04a71d816..2fb1fbe91b 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha.frag
@@ -1,7 +1,10 @@
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
 void main() {
     lowp float u = qt_TexCoord0.x;
     lowp float v = qt_TexCoord0.y;
-    gl_FragColor = vec4(u*v, v*v, v, v);
+    fragColor = vec4(u*v, v*v, v, v);
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha_rhi.frag
deleted file mode 100644
index 2fb1fbe91b..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_alpha_rhi.frag
+++ /dev/null
@@ -1,10 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-void main() {
-    lowp float u = qt_TexCoord0.x;
-    lowp float v = qt_TexCoord0.y;
-    fragColor = vec4(u*v, v*v, v, v);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_rhi.frag
deleted file mode 100644
index aa850af449..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/basic_rhi.frag
+++ /dev/null
@@ -1,8 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-void main() {
-    fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk.frag
index d63a0fa6ee..5d528e1d7a 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk.frag
@@ -1,14 +1,18 @@
-uniform lowp sampler2D cyan;
-uniform lowp sampler2D magenta;
-uniform lowp sampler2D yellow;
-uniform lowp sampler2D black;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D cyan;
+layout(binding = 2) uniform sampler2D magenta;
+layout(binding = 3) uniform sampler2D yellow;
+layout(binding = 4) uniform sampler2D black;
+
 void main() {
-    highp vec2 t = qt_TexCoord0 * 3. - 1.;
-    lowp float c = texture2D(cyan, t + vec2(.05, .09)).a;
-    lowp float m = texture2D(magenta, t + vec2(.04, -.10)).a;
-    lowp float y = texture2D(yellow, t + vec2(-.10, .01)).a;
-    lowp float k = texture2D(black, t).a;
-    gl_FragColor = 1. - vec4(c + k, m + k, y + k, 0.);
+    vec2 t = qt_TexCoord0 * 3. - 1.;
+    lowp float c = texture(cyan, t + vec2(.05, .09)).a;
+    lowp float m = texture(magenta, t + vec2(.04, -.10)).a;
+    lowp float y = texture(yellow, t + vec2(-.10, .01)).a;
+    lowp float k = texture(black, t).a;
+    fragColor = 1. - vec4(c + k, m + k, y + k, 0.);
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk_rhi.frag
deleted file mode 100644
index 5d528e1d7a..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/cmyk_rhi.frag
+++ /dev/null
@@ -1,18 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D cyan;
-layout(binding = 2) uniform sampler2D magenta;
-layout(binding = 3) uniform sampler2D yellow;
-layout(binding = 4) uniform sampler2D black;
-
-void main() {
-    vec2 t = qt_TexCoord0 * 3. - 1.;
-    lowp float c = texture(cyan, t + vec2(.05, .09)).a;
-    lowp float m = texture(magenta, t + vec2(.04, -.10)).a;
-    lowp float y = texture(yellow, t + vec2(-.10, .01)).a;
-    lowp float k = texture(black, t).a;
-    fragColor = 1. - vec4(c + k, m + k, y + k, 0.);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/compile.bat b/tests/manual/scenegraph_lancelot/data/shared/shaders/compile.bat
deleted file mode 100644
index e13d1f074e..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/compile.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/subrect.vert subrect_rhi.vert
-qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/wave.vert wave_rhi.vert
-
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/basic.frag basic_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/basic_alpha.frag basic_alpha_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/cmyk.frag cmyk_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/culling.frag culling_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/desaturate.frag desaturate_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/edge.frag edge_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradient.frag gradient_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradient2.frag gradient2_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradient3.frag gradient3_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradient4.frag gradient4_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradient5.frag gradient5_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/gradientgrid.frag gradientgrid_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/property.frag property_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/shadow.frag shadow_rhi.frag
-qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o +qsb/stencil.frag stencil_rhi.frag
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/culling.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/culling.frag
index 1b12df7c6d..cc3c9a0f14 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/culling.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/culling.frag
@@ -1,9 +1,13 @@
-varying highp vec2 qt_TexCoord0;
-uniform sampler2D frontSource;
-uniform sampler2D backSource;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D frontSource;
+layout(binding = 2) uniform sampler2D backSource;
+
 void main() {
-    gl_FragColor = gl_FrontFacing
-                 ? texture2D(frontSource, qt_TexCoord0)
-                 : texture2D(backSource, qt_TexCoord0);
+    fragColor = gl_FrontFacing
+                 ? texture(frontSource, qt_TexCoord0)
+                 : texture(backSource, qt_TexCoord0);
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/culling_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/culling_rhi.frag
deleted file mode 100644
index cc3c9a0f14..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/culling_rhi.frag
+++ /dev/null
@@ -1,13 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D frontSource;
-layout(binding = 2) uniform sampler2D backSource;
-
-void main() {
-    fragColor = gl_FrontFacing
-                 ? texture(frontSource, qt_TexCoord0)
-                 : texture(backSource, qt_TexCoord0);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate.frag
index a38f3d1de2..a4299c6d68 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate.frag
@@ -1,9 +1,12 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+layout(binding = 1) uniform sampler2D source;
 
 void main() {
-    lowp vec4 c = texture2D(source, qt_TexCoord0);
+    lowp vec4 c = texture(source, qt_TexCoord0);
     lowp float level = c.r * 0.3 + c.g * 0.59 + c.b * 0.11;
 
-    gl_FragColor = vec4(level, level, level, c.a);
+    fragColor = vec4(level, level, level, c.a);
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate_rhi.frag
deleted file mode 100644
index a4299c6d68..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/desaturate_rhi.frag
+++ /dev/null
@@ -1,12 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-layout(binding = 1) uniform sampler2D source;
-
-void main() {
-    lowp vec4 c = texture(source, qt_TexCoord0);
-    lowp float level = c.r * 0.3 + c.g * 0.59 + c.b * 0.11;
-
-    fragColor = vec4(level, level, level, c.a);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/edge.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/edge.frag
index 8cb616f3e0..77d7b47499 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/edge.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/edge.frag
@@ -1,14 +1,23 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
-uniform highp vec2 textureSize;
-uniform lowp vec4 color;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
+layout(std140, binding = 0) uniform buf {
+    mat4 qt_Matrix;
+    float qt_Opacity;
+    vec2 textureSize;
+    vec4 color;
+} ubuf;
+
 void main() {
-    highp vec2 dx = vec2(0.5 / textureSize.x, 0.);
-    highp vec2 dy = vec2(0., 0.5 / textureSize.y);
-    gl_FragColor = color * 0.25
-                 * (texture2D(source, qt_TexCoord0 + dx + dy).a
-                 + texture2D(source, qt_TexCoord0 + dx - dy).a
-                 + texture2D(source, qt_TexCoord0 - dx + dy).a
-                 + texture2D(source, qt_TexCoord0 - dx - dy).a);
+    vec2 dx = vec2(0.5 / ubuf.textureSize.x, 0.);
+    vec2 dy = vec2(0., 0.5 / ubuf.textureSize.y);
+    fragColor = ubuf.color * 0.25
+                * (texture(source, qt_TexCoord0 + dx + dy).a
+                + texture(source, qt_TexCoord0 + dx - dy).a
+                + texture(source, qt_TexCoord0 - dx + dy).a
+                + texture(source, qt_TexCoord0 - dx - dy).a);
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/edge_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/edge_rhi.frag
deleted file mode 100644
index 77d7b47499..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/edge_rhi.frag
+++ /dev/null
@@ -1,23 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-layout(std140, binding = 0) uniform buf {
-    mat4 qt_Matrix;
-    float qt_Opacity;
-    vec2 textureSize;
-    vec4 color;
-} ubuf;
-
-void main() {
-    vec2 dx = vec2(0.5 / ubuf.textureSize.x, 0.);
-    vec2 dy = vec2(0., 0.5 / ubuf.textureSize.y);
-    fragColor = ubuf.color * 0.25
-                * (texture(source, qt_TexCoord0 + dx + dy).a
-                + texture(source, qt_TexCoord0 + dx - dy).a
-                + texture(source, qt_TexCoord0 - dx + dy).a
-                + texture(source, qt_TexCoord0 - dx - dy).a);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient.frag
index c581cc0c73..84eee1dbfe 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient.frag
@@ -1,6 +1,10 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
 void main() {
-    gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1) * texture2D(source, qt_TexCoord0).a;
+    fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1) * texture(source, qt_TexCoord0).a;
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2.frag
index 5f07e56d4a..b08e6339b3 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2.frag
@@ -1,6 +1,10 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
 void main() {
-    gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 0, 1) + texture2D(source, qt_TexCoord0);
+    fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 0, 1) + texture(source, qt_TexCoord0);
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2_rhi.frag
deleted file mode 100644
index b08e6339b3..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient2_rhi.frag
+++ /dev/null
@@ -1,10 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-void main() {
-    fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 0, 1) + texture(source, qt_TexCoord0);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3.frag
index 61c9d46f94..2e523c2879 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3.frag
@@ -1,6 +1,10 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
 void main() {
-    gl_FragColor = vec4(0, qt_TexCoord0.y, 1, 1) * texture2D(source, qt_TexCoord0).a;
+    fragColor = vec4(0, qt_TexCoord0.y, 1, 1) * texture(source, qt_TexCoord0).a;
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3_rhi.frag
deleted file mode 100644
index 2e523c2879..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient3_rhi.frag
+++ /dev/null
@@ -1,10 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-void main() {
-    fragColor = vec4(0, qt_TexCoord0.y, 1, 1) * texture(source, qt_TexCoord0).a;
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4.frag
index 81d96ce126..a100ba2cd7 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4.frag
@@ -1,6 +1,10 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
 void main() {
-    gl_FragColor = vec4(1, qt_TexCoord0.y, 0, 1) * texture2D(source, qt_TexCoord0).a;
+    fragColor = vec4(1, qt_TexCoord0.y, 0, 1) * texture(source, qt_TexCoord0).a;
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4_rhi.frag
deleted file mode 100644
index a100ba2cd7..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient4_rhi.frag
+++ /dev/null
@@ -1,10 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-void main() {
-    fragColor = vec4(1, qt_TexCoord0.y, 0, 1) * texture(source, qt_TexCoord0).a;
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5.frag
index 33485542af..4ec104bd14 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5.frag
@@ -1,6 +1,10 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
 void main() {
-    gl_FragColor = vec4(qt_TexCoord0.x, 1, 0, 1) * texture2D(source, qt_TexCoord0).a;
+    fragColor = vec4(qt_TexCoord0.x, 1, 0, 1) * texture(source, qt_TexCoord0).a;
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5_rhi.frag
deleted file mode 100644
index 4ec104bd14..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient5_rhi.frag
+++ /dev/null
@@ -1,10 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-void main() {
-    fragColor = vec4(qt_TexCoord0.x, 1, 0, 1) * texture(source, qt_TexCoord0).a;
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient_rhi.frag
deleted file mode 100644
index 84eee1dbfe..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradient_rhi.frag
+++ /dev/null
@@ -1,10 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-void main() {
-    fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1) * texture(source, qt_TexCoord0).a;
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid.frag
index 851f07c948..999629745b 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid.frag
@@ -1,9 +1,13 @@
-uniform lowp sampler2D source;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
 void main() {
     lowp float r = mod(qt_TexCoord0.x * 10.0, 1.0);
     lowp float g = mod(qt_TexCoord0.y * 10.0, 1.0);
     lowp float b = qt_TexCoord0.x;
-    gl_FragColor = vec4(r, g, b, 1) * texture2D(source, qt_TexCoord0).a;
+    fragColor = vec4(r, g, b, 1) * texture(source, qt_TexCoord0).a;
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid_rhi.frag
deleted file mode 100644
index 999629745b..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/gradientgrid_rhi.frag
+++ /dev/null
@@ -1,13 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-void main() {
-    lowp float r = mod(qt_TexCoord0.x * 10.0, 1.0);
-    lowp float g = mod(qt_TexCoord0.y * 10.0, 1.0);
-    lowp float b = qt_TexCoord0.x;
-    fragColor = vec4(r, g, b, 1) * texture(source, qt_TexCoord0).a;
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/property.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/property.frag
index 0d28bff43b..2ffa707fb1 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/property.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/property.frag
@@ -1,6 +1,14 @@
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
-uniform lowp float colorProperty;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(std140, binding = 0) uniform buf {
+    mat4 qt_Matrix;
+    float qt_Opacity;
+    float colorProperty;
+} ubuf;
+
 void main() {
-    gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, colorProperty, 1);
+    fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, ubuf.colorProperty, 1);
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/property_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/property_rhi.frag
deleted file mode 100644
index 2ffa707fb1..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/property_rhi.frag
+++ /dev/null
@@ -1,14 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(std140, binding = 0) uniform buf {
-    mat4 qt_Matrix;
-    float qt_Opacity;
-    float colorProperty;
-} ubuf;
-
-void main() {
-    fragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, ubuf.colorProperty, 1);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow.frag
index 0a6cdf3044..6a2d8dc122 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow.frag
@@ -1,14 +1,23 @@
-uniform lowp sampler2D source;
-uniform highp vec2 offset;
-uniform highp vec2 delta;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D source;
+
+layout(std140, binding = 0) uniform buf {
+    mat4 qt_Matrix;
+    float qt_Opacity;
+    vec2 offset;
+    vec2 delta;
+} ubuf;
+
 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);
+    vec2 delta2 = vec2(ubuf.delta.x, -ubuf.delta.y);
+    float shadow = 0.25 * (texture(source, qt_TexCoord0 - ubuf.offset + ubuf.delta).a
+                         + texture(source, qt_TexCoord0 - ubuf.offset - ubuf.delta).a
+                         + texture(source, qt_TexCoord0 - ubuf.offset + delta2).a
+                         + texture(source, qt_TexCoord0 - ubuf.offset - delta2).a);
+    vec4 color = texture(source, qt_TexCoord0);
+    fragColor = mix(vec4(vec3(0.), 0.5 * shadow), color, color.a);
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow_rhi.frag
deleted file mode 100644
index 6a2d8dc122..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/shadow_rhi.frag
+++ /dev/null
@@ -1,23 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D source;
-
-layout(std140, binding = 0) uniform buf {
-    mat4 qt_Matrix;
-    float qt_Opacity;
-    vec2 offset;
-    vec2 delta;
-} ubuf;
-
-void main() {
-    vec2 delta2 = vec2(ubuf.delta.x, -ubuf.delta.y);
-    float shadow = 0.25 * (texture(source, qt_TexCoord0 - ubuf.offset + ubuf.delta).a
-                         + texture(source, qt_TexCoord0 - ubuf.offset - ubuf.delta).a
-                         + texture(source, qt_TexCoord0 - ubuf.offset + delta2).a
-                         + texture(source, qt_TexCoord0 - ubuf.offset - delta2).a);
-    vec4 color = texture(source, qt_TexCoord0);
-    fragColor = mix(vec4(vec3(0.), 0.5 * shadow), color, color.a);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil.frag
index 33c6cee064..734be73fdb 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil.frag
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil.frag
@@ -1,7 +1,11 @@
-uniform lowp sampler2D maskSource;
-uniform lowp sampler2D colorSource;
-varying highp vec2 qt_TexCoord0;
-uniform lowp float qt_Opacity;
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D maskSource;
+layout(binding = 2) uniform sampler2D colorSource;
+
 void main() {
-    gl_FragColor = texture2D(maskSource, qt_TexCoord0).a * texture2D(colorSource, qt_TexCoord0.yx);
+    fragColor = texture(maskSource, qt_TexCoord0).a * texture(colorSource, qt_TexCoord0.yx);
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil_rhi.frag b/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil_rhi.frag
deleted file mode 100644
index 734be73fdb..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/stencil_rhi.frag
+++ /dev/null
@@ -1,11 +0,0 @@
-#version 440
-
-layout(location = 0) in vec2 qt_TexCoord0;
-layout(location = 0) out vec4 fragColor;
-
-layout(binding = 1) uniform sampler2D maskSource;
-layout(binding = 2) uniform sampler2D colorSource;
-
-void main() {
-    fragColor = texture(maskSource, qt_TexCoord0).a * texture(colorSource, qt_TexCoord0.yx);
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect.vert
index 2ab6f94c19..96494b7149 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect.vert
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect.vert
@@ -1,11 +1,17 @@
-uniform highp mat4 qt_Matrix;
-attribute highp vec4 qt_Vertex;
-attribute highp vec2 qt_MultiTexCoord0;
-varying highp vec2 qt_TexCoord0;
-uniform highp vec4 qt_SubRect_source;
+#version 440
+
+layout(location = 0) in vec4 qt_Vertex;
+layout(location = 1) in vec2 qt_MultiTexCoord0;
+
+layout(location = 0) out vec2 qt_TexCoord0;
+
+layout(std140, binding = 0) uniform buf {
+    mat4 qt_Matrix;
+    vec4 qt_SubRect_source;
+} ubuf;
 
 void main()
 {
-    qt_TexCoord0 = qt_SubRect_source.xy + qt_SubRect_source.zw * qt_MultiTexCoord0;
-    gl_Position = qt_Matrix * qt_Vertex;
+    qt_TexCoord0 = ubuf.qt_SubRect_source.xy + ubuf.qt_SubRect_source.zw * qt_MultiTexCoord0;
+    gl_Position = ubuf.qt_Matrix * qt_Vertex;
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect_rhi.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect_rhi.vert
deleted file mode 100644
index 96494b7149..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/subrect_rhi.vert
+++ /dev/null
@@ -1,17 +0,0 @@
-#version 440
-
-layout(location = 0) in vec4 qt_Vertex;
-layout(location = 1) in vec2 qt_MultiTexCoord0;
-
-layout(location = 0) out vec2 qt_TexCoord0;
-
-layout(std140, binding = 0) uniform buf {
-    mat4 qt_Matrix;
-    vec4 qt_SubRect_source;
-} ubuf;
-
-void main()
-{
-    qt_TexCoord0 = ubuf.qt_SubRect_source.xy + ubuf.qt_SubRect_source.zw * qt_MultiTexCoord0;
-    gl_Position = ubuf.qt_Matrix * qt_Vertex;
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/wave.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/wave.vert
index 38e523c06b..38f6173773 100644
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/wave.vert
+++ b/tests/manual/scenegraph_lancelot/data/shared/shaders/wave.vert
@@ -1,12 +1,18 @@
-uniform highp mat4 qt_Matrix;
-attribute highp vec4 qt_Vertex;
-attribute highp vec2 qt_MultiTexCoord0;
-varying highp vec2 qt_TexCoord0;
+#version 440
+
+layout(location = 0) in vec4 qt_Vertex;
+layout(location = 1) in vec2 qt_MultiTexCoord0;
+
+layout(location = 0) out vec2 qt_TexCoord0;
+
+layout(std140, binding = 0) uniform buf {
+    mat4 qt_Matrix;
+} ubuf;
 
 void main() {
-    highp vec4 pos = qt_Vertex;
+    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;
+    gl_Position = ubuf.qt_Matrix * pos;
     qt_TexCoord0 = qt_MultiTexCoord0;
 }
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shaders/wave_rhi.vert b/tests/manual/scenegraph_lancelot/data/shared/shaders/wave_rhi.vert
deleted file mode 100644
index 38f6173773..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shaders/wave_rhi.vert
+++ /dev/null
@@ -1,18 +0,0 @@
-#version 440
-
-layout(location = 0) in vec4 qt_Vertex;
-layout(location = 1) in vec2 qt_MultiTexCoord0;
-
-layout(location = 0) out vec2 qt_TexCoord0;
-
-layout(std140, binding = 0) uniform buf {
-    mat4 qt_Matrix;
-} ubuf;
-
-void main() {
-    vec4 pos = qt_Vertex;
-    pos.x += sin(qt_Vertex.y * 0.02) * 20.;
-    pos.y += sin(qt_Vertex.x * 0.02) * 20.;
-    gl_Position = ubuf.qt_Matrix * pos;
-    qt_TexCoord0 = qt_MultiTexCoord0;
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shared/shared.qrc b/tests/manual/scenegraph_lancelot/data/shared/shared.qrc
deleted file mode 100644
index 4bd955b2b2..0000000000
--- a/tests/manual/scenegraph_lancelot/data/shared/shared.qrc
+++ /dev/null
@@ -1,38 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>shaders/basic.frag</file>
-        <file>shaders/basic_alpha.frag</file>
-        <file>shaders/cmyk.frag</file>
-        <file>shaders/culling.frag</file>
-        <file>shaders/desaturate.frag</file>
-        <file>shaders/edge.frag</file>
-        <file>shaders/gradient.frag</file>
-        <file>shaders/gradient2.frag</file>
-        <file>shaders/gradient3.frag</file>
-        <file>shaders/gradient4.frag</file>
-        <file>shaders/gradient5.frag</file>
-        <file>shaders/gradientgrid.frag</file>
-        <file>shaders/property.frag</file>
-        <file>shaders/shadow.frag</file>
-        <file>shaders/stencil.frag</file>
-        <file>shaders/subrect.vert</file>
-        <file>shaders/wave.vert</file>
-        <file>shaders/+qsb/basic.frag</file>
-        <file>shaders/+qsb/basic_alpha.frag</file>
-        <file>shaders/+qsb/cmyk.frag</file>
-        <file>shaders/+qsb/culling.frag</file>
-        <file>shaders/+qsb/desaturate.frag</file>
-        <file>shaders/+qsb/edge.frag</file>
-        <file>shaders/+qsb/gradient.frag</file>
-        <file>shaders/+qsb/gradient2.frag</file>
-        <file>shaders/+qsb/gradient3.frag</file>
-        <file>shaders/+qsb/gradient4.frag</file>
-        <file>shaders/+qsb/gradient5.frag</file>
-        <file>shaders/+qsb/gradientgrid.frag</file>
-        <file>shaders/+qsb/property.frag</file>
-        <file>shaders/+qsb/shadow.frag</file>
-        <file>shaders/+qsb/stencil.frag</file>
-        <file>shaders/+qsb/subrect.vert</file>
-        <file>shaders/+qsb/wave.vert</file>
-    </qresource>
-</RCC>
diff --git a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
index b324ac3685..0514b6660e 100644
--- a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
+++ b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from scenegrabber.pro.
-
 #####################################################################
 ## qmlscenegrabber Binary:
 #####################################################################
@@ -13,50 +11,26 @@ qt_internal_add_manual_test(qmlscenegrabber
         Qt::Quick
 )
 
-# Resources:
-set(shared_resource_files
-    "../data/shared/shaders/+qsb/basic.frag"
-    "../data/shared/shaders/+qsb/basic_alpha.frag"
-    "../data/shared/shaders/+qsb/cmyk.frag"
-    "../data/shared/shaders/+qsb/culling.frag"
-    "../data/shared/shaders/+qsb/desaturate.frag"
-    "../data/shared/shaders/+qsb/edge.frag"
-    "../data/shared/shaders/+qsb/gradient.frag"
-    "../data/shared/shaders/+qsb/gradient2.frag"
-    "../data/shared/shaders/+qsb/gradient3.frag"
-    "../data/shared/shaders/+qsb/gradient4.frag"
-    "../data/shared/shaders/+qsb/gradient5.frag"
-    "../data/shared/shaders/+qsb/gradientgrid.frag"
-    "../data/shared/shaders/+qsb/property.frag"
-    "../data/shared/shaders/+qsb/shadow.frag"
-    "../data/shared/shaders/+qsb/stencil.frag"
-    "../data/shared/shaders/+qsb/subrect.vert"
-    "../data/shared/shaders/+qsb/wave.vert"
-    "../data/shared/shaders/basic.frag"
-    "../data/shared/shaders/basic_alpha.frag"
-    "../data/shared/shaders/cmyk.frag"
-    "../data/shared/shaders/culling.frag"
-    "../data/shared/shaders/desaturate.frag"
-    "../data/shared/shaders/edge.frag"
-    "../data/shared/shaders/gradient.frag"
-    "../data/shared/shaders/gradient2.frag"
-    "../data/shared/shaders/gradient3.frag"
-    "../data/shared/shaders/gradient4.frag"
-    "../data/shared/shaders/gradient5.frag"
-    "../data/shared/shaders/gradientgrid.frag"
-    "../data/shared/shaders/property.frag"
-    "../data/shared/shaders/shadow.frag"
-    "../data/shared/shaders/stencil.frag"
-    "../data/shared/shaders/subrect.vert"
-    "../data/shared/shaders/wave.vert"
-)
-
-qt_internal_add_resource(qmlscenegrabber "shared"
+qt6_add_shaders(qmlscenegrabber "qmlscenegrabber_shaders"
+    BATCHABLE
     PREFIX
-        "/"
-    BASE
-        "../data/shared"
+        "shaders"
     FILES
-        ${shared_resource_files}
+        "../data/shared/shaders/basic_alpha.frag"
+        "../data/shared/shaders/basic.frag"
+        "../data/shared/shaders/cmyk.frag"
+        "../data/shared/shaders/culling.frag"
+        "../data/shared/shaders/desaturate.frag"
+        "../data/shared/shaders/edge.frag"
+        "../data/shared/shaders/gradient2.frag"
+        "../data/shared/shaders/gradient3.frag"
+        "../data/shared/shaders/gradient4.frag"
+        "../data/shared/shaders/gradient5.frag"
+        "../data/shared/shaders/gradient.frag"
+        "../data/shared/shaders/gradientgrid.frag"
+        "../data/shared/shaders/property.frag"
+        "../data/shared/shaders/shadow.frag"
+        "../data/shared/shaders/stencil.frag"
+        "../data/shared/shaders/subrect.vert"
+        "../data/shared/shaders/wave.vert"
 )
-