Migrate to fixed add_shaders prefix handling

Change-Id: I6c5b0680d32bc3650983c64cc4583f790774da88
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

5 files changed, 7 insertions, 5 deletions

diff --git a/examples/quick/scenegraph/custommaterial/CMakeLists.txt b/examples/quick/scenegraph/custommaterial/CMakeLists.txt
index 21951727f9..cbf6b0b5c7 100644
--- a/examples/quick/scenegraph/custommaterial/CMakeLists.txt
+++ b/examples/quick/scenegraph/custommaterial/CMakeLists.txt
@@ -50,7 +50,7 @@ qt6_add_shaders(custommaterial_declarative "shaders"
     PRECOMPILE
     OPTIMIZED
     PREFIX
-        "/scenegraph/custommaterial/shaders"
+        "/scenegraph/custommaterial"
     FILES
         "shaders/mandelbrot.vert"
         "shaders/mandelbrot.frag"
diff --git a/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt b/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt
index fc103f406d..b33809f8a8 100644
--- a/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt
+++ b/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt
@@ -50,7 +50,7 @@ qt6_add_shaders(twotextureproviders "shaders"
     PRECOMPILE
     OPTIMIZED
     PREFIX
-        "/scenegraph/twotextureproviders/shaders"
+        "/scenegraph/twotextureproviders"
     FILES
         "shaders/xorblender.vert"
         "shaders/xorblender.frag"
diff --git a/examples/quick/shadereffects/CMakeLists.txt b/examples/quick/shadereffects/CMakeLists.txt
index fb0efd53a7..0a00936d77 100644
--- a/examples/quick/shadereffects/CMakeLists.txt
+++ b/examples/quick/shadereffects/CMakeLists.txt
@@ -56,7 +56,7 @@ qt6_add_shaders(shadereffects "shaders"
     PRECOMPILE
     OPTIMIZED
     PREFIX
-        "/shadereffects/content/shaders"
+        "/shadereffects"
     FILES
         "content/shaders/genie.vert"
         "content/shaders/blur.frag"
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index 2c2324d896..6feb0e807a 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -237,7 +237,7 @@ qt_internal_add_shaders(Quick "scenegraph_shaders"
     PRECOMPILE
     OPTIMIZED
     PREFIX
-        "/qt-project.org/scenegraph/shaders_ng"
+        "/qt-project.org"
     FILES
         "scenegraph/shaders_ng/24bittextmask.frag"
         "scenegraph/shaders_ng/32bitcolortext.frag"
diff --git a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
index 0514b6660e..e635287cee 100644
--- a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
+++ b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
@@ -14,7 +14,9 @@ qt_internal_add_manual_test(qmlscenegrabber
 qt6_add_shaders(qmlscenegrabber "qmlscenegrabber_shaders"
     BATCHABLE
     PREFIX
-        "shaders"
+        "/"
+    BASE
+        "../data/shared"
     FILES
         "../data/shared/shaders/basic_alpha.frag"
         "../data/shared/shaders/basic.frag"