Use fixed qt_add_resource BASE argument

Task-number: QTBUG-86726
Change-Id: I33ec2a73254d9b44de83f4f5491f372b4bb9959b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

8 files changed, 28 insertions, 54 deletions

diff --git a/examples/webenginewidgets/cookiebrowser/CMakeLists.txt b/examples/webenginewidgets/cookiebrowser/CMakeLists.txt
index 9837ae62d..16d2bfab6 100644
--- a/examples/webenginewidgets/cookiebrowser/CMakeLists.txt
+++ b/examples/webenginewidgets/cookiebrowser/CMakeLists.txt
@@ -35,9 +35,6 @@ target_link_libraries(cookiebrowser PUBLIC
 
 
 # Resources:
-set_source_files_properties("3rdparty/view-refresh.png"
-    PROPERTIES QT_RESOURCE_ALIAS "view-refresh.png"
-)
 set(cookiebrowser_resource_files
     "3rdparty/view-refresh.png"
 )
@@ -45,6 +42,8 @@ set(cookiebrowser_resource_files
 qt6_add_resources(cookiebrowser "cookiebrowser"
     PREFIX
         "/"
+    BASE
+        "3rdparty"
     FILES
         ${cookiebrowser_resource_files}
 )
diff --git a/examples/webenginewidgets/markdowneditor/CMakeLists.txt b/examples/webenginewidgets/markdowneditor/CMakeLists.txt
index e6367c3cb..29bcc2d70 100644
--- a/examples/webenginewidgets/markdowneditor/CMakeLists.txt
+++ b/examples/webenginewidgets/markdowneditor/CMakeLists.txt
@@ -38,10 +38,10 @@ target_link_libraries(markdowneditor PUBLIC
 
 # Resources:
 set(markdowneditor_resource_files
-    "3rdparty/markdown.css"
-    "3rdparty/marked.js"
-    "default.md"
-    "index.html"
+    "resources/3rdparty/markdown.css"
+    "resources/3rdparty/marked.js"
+    "resources/default.md"
+    "resources/index.html"
 )
 
 qt6_add_resources(markdowneditor "markdowneditor"
diff --git a/examples/webenginewidgets/notifications/CMakeLists.txt b/examples/webenginewidgets/notifications/CMakeLists.txt
index 722d1c61e..0f6e504d9 100644
--- a/examples/webenginewidgets/notifications/CMakeLists.txt
+++ b/examples/webenginewidgets/notifications/CMakeLists.txt
@@ -34,8 +34,8 @@ target_link_libraries(notifications PUBLIC
 
 # Resources:
 set(data_resource_files
-    "icon.png"
-    "index.html"
+    "data/icon.png"
+    "data/index.html"
 )
 
 qt6_add_resources(notifications "data"
diff --git a/examples/webenginewidgets/printme/CMakeLists.txt b/examples/webenginewidgets/printme/CMakeLists.txt
index 705214fc3..6b21de270 100644
--- a/examples/webenginewidgets/printme/CMakeLists.txt
+++ b/examples/webenginewidgets/printme/CMakeLists.txt
@@ -36,9 +36,9 @@ target_link_libraries(printme PUBLIC
 
 # Resources:
 set(data_resource_files
-    "icon.svg"
-    "index.html"
-    "style.css"
+    "data/icon.svg"
+    "data/index.html"
+    "data/style.css"
 )
 
 qt6_add_resources(printme "data"
diff --git a/examples/webenginewidgets/simplebrowser/CMakeLists.txt b/examples/webenginewidgets/simplebrowser/CMakeLists.txt
index 4b8bb732e..21ae993e5 100644
--- a/examples/webenginewidgets/simplebrowser/CMakeLists.txt
+++ b/examples/webenginewidgets/simplebrowser/CMakeLists.txt
@@ -43,8 +43,8 @@ target_link_libraries(simplebrowser PUBLIC
 
 # Resources:
 set(simplebrowser_resource_files
-    "AppLogoColor.png"
-    "ninja.png"
+    "data/AppLogoColor.png"
+    "data/ninja.png"
 )
 
 qt6_add_resources(simplebrowser "simplebrowser"
@@ -55,46 +55,22 @@ qt6_add_resources(simplebrowser "simplebrowser"
     FILES
         ${simplebrowser_resource_files}
 )
-set_source_files_properties("data/3rdparty/dialog-error.png"
-    PROPERTIES QT_RESOURCE_ALIAS "dialog-error.png"
-)
-set_source_files_properties("data/3rdparty/edit-clear.png"
-    PROPERTIES QT_RESOURCE_ALIAS "edit-clear.png"
-)
-set_source_files_properties("data/3rdparty/go-bottom.png"
-    PROPERTIES QT_RESOURCE_ALIAS "go-bottom.png"
-)
-set_source_files_properties("data/3rdparty/go-next.png"
-    PROPERTIES QT_RESOURCE_ALIAS "go-next.png"
-)
-set_source_files_properties("data/3rdparty/go-previous.png"
-    PROPERTIES QT_RESOURCE_ALIAS "go-previous.png"
-)
-set_source_files_properties("data/3rdparty/process-stop.png"
-    PROPERTIES QT_RESOURCE_ALIAS "process-stop.png"
-)
-set_source_files_properties("data/3rdparty/text-html.png"
-    PROPERTIES QT_RESOURCE_ALIAS "text-html.png"
-)
-set_source_files_properties("data/3rdparty/view-refresh.png"
-    PROPERTIES QT_RESOURCE_ALIAS "view-refresh.png"
-)
 set(simplebrowser1_resource_files
-    "3rdparty/dialog-error.png"
-    "3rdparty/edit-clear.png"
-    "3rdparty/go-bottom.png"
-    "3rdparty/go-next.png"
-    "3rdparty/go-previous.png"
-    "3rdparty/process-stop.png"
-    "3rdparty/text-html.png"
-    "3rdparty/view-refresh.png"
+    "data/3rdparty/dialog-error.png"
+    "data/3rdparty/edit-clear.png"
+    "data/3rdparty/go-bottom.png"
+    "data/3rdparty/go-next.png"
+    "data/3rdparty/go-previous.png"
+    "data/3rdparty/process-stop.png"
+    "data/3rdparty/text-html.png"
+    "data/3rdparty/view-refresh.png"
 )
 
 qt6_add_resources(simplebrowser "simplebrowser1"
     PREFIX
         "/"
     BASE
-        "data"
+        "data/3rdparty"
     FILES
         ${simplebrowser1_resource_files}
 )
diff --git a/examples/webenginewidgets/spellchecker/CMakeLists.txt b/examples/webenginewidgets/spellchecker/CMakeLists.txt
index d8b181841..b8e17b1ac 100644
--- a/examples/webenginewidgets/spellchecker/CMakeLists.txt
+++ b/examples/webenginewidgets/spellchecker/CMakeLists.txt
@@ -34,9 +34,9 @@ target_link_libraries(spellchecker PUBLIC
 
 # Resources:
 set(spellchecker_resource_files
-    "icon.svg"
-    "index.html"
-    "style.css"
+    "data/icon.svg"
+    "data/index.html"
+    "data/style.css"
 )
 
 qt6_add_resources(spellchecker "spellchecker"
diff --git a/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt b/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt
index 91d5200e1..596da7964 100644
--- a/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt
+++ b/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt
@@ -34,9 +34,6 @@ target_link_libraries(stylesheetbrowser PUBLIC
 
 
 # Resources:
-set_source_files_properties("3rdparty/view-refresh.png"
-    PROPERTIES QT_RESOURCE_ALIAS "view-refresh.png"
-)
 set(stylesheetbrowser_resource_files
     "3rdparty/view-refresh.png"
 )
@@ -44,6 +41,8 @@ set(stylesheetbrowser_resource_files
 qt6_add_resources(stylesheetbrowser "stylesheetbrowser"
     PREFIX
         "/"
+    BASE
+        "3rdparty"
     FILES
         ${stylesheetbrowser_resource_files}
 )
diff --git a/examples/webenginewidgets/videoplayer/CMakeLists.txt b/examples/webenginewidgets/videoplayer/CMakeLists.txt
index 3d064f862..f6db97149 100644
--- a/examples/webenginewidgets/videoplayer/CMakeLists.txt
+++ b/examples/webenginewidgets/videoplayer/CMakeLists.txt
@@ -36,7 +36,7 @@ target_link_libraries(videoplayer PUBLIC
 
 # Resources:
 set(videoplayer_resource_files
-    "index.html"
+    "data/index.html"
 )
 
 qt6_add_resources(videoplayer "videoplayer"