Fix BASE argument of qt_add_resources

The BASE argument of qt_add_resources now denotes the root point of the
alias of the file.  Before, BASE was merely prepended to every file that
got passed to qt_add_resources.

Old behavior:
    qt_add_resources(app "images"
        PREFIX "/"
        BASE "../shared"
        FILES "images/button.png")

Alias is "../shared/images/button.png", and pro2cmake generated
QT_RESOURCE_ALIAS assignments to fix this.

New behavior:
    qt_add_resources(app "images"
        PREFIX "/"
        BASE "../shared"
        FILES "../shared/images/button.png")

The alias is "images/button.png".  No extra QT_RESOURCE_ALIAS assignment
is needed.

The new behavior is in effect for user projects and for Qt repositories
that define QT_USE_FIXED_QT_ADD_RESOURCE_BASE.  Qt repositories will be
ported one by one to this new behavior.  Then the old code path can be
removed.

Task-number: QTBUG-86726
Change-Id: Ib895edd4df8e97b54badadd9a1c34408beff131f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 92185d417de43237ae62eae55599c65922cd9a15)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

27 files changed, 697 insertions, 2050 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ea40913cd..230b593711 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,9 @@ project(QtBase
 # Make sure we only use latest private CMake API, aka no compatibility wrappers.
 set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE)
 
+# Make sure we use the fixed BASE argument of qt_add_resource.
+set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE)
+
 if(NOT QT_BUILD_STANDALONE_TESTS)
     ## Add some paths to check for cmake modules:
     list(PREPEND CMAKE_MODULE_PATH
diff --git a/examples/widgets/painting/affine/.prev_CMakeLists.txt b/examples/widgets/painting/affine/.prev_CMakeLists.txt
index d367ef75bd..4efe5f28a7 100644
--- a/examples/widgets/painting/affine/.prev_CMakeLists.txt
+++ b/examples/widgets/painting/affine/.prev_CMakeLists.txt
@@ -42,147 +42,42 @@ target_link_libraries(affine PUBLIC
 
 
 # Resources:
-set_source_files_properties("../shared/images/button_normal_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_normal_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_normal_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_pressed_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
-)
-set_source_files_properties("../shared/images/frame_bottom.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
-)
-set_source_files_properties("../shared/images/frame_bottomleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
-)
-set_source_files_properties("../shared/images/frame_bottomright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
-)
-set_source_files_properties("../shared/images/frame_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
-)
-set_source_files_properties("../shared/images/frame_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
-)
-set_source_files_properties("../shared/images/frame_top.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
-)
-set_source_files_properties("../shared/images/frame_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
-)
-set_source_files_properties("../shared/images/frame_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_left_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_right_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_top_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
-)
-set_source_files_properties("../shared/images/groupframe_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
-)
-set_source_files_properties("../shared/images/line_dashed.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
-)
-set_source_files_properties("../shared/images/line_dotted.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
-)
-set_source_files_properties("../shared/images/line_solid.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
-)
-set_source_files_properties("../shared/images/radiobutton-on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
-)
-set_source_files_properties("../shared/images/radiobutton_off.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
-)
-set_source_files_properties("../shared/images/radiobutton_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
-)
-set_source_files_properties("../shared/images/slider_bar.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
-)
-set_source_files_properties("../shared/images/slider_thumb_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
-)
-set_source_files_properties("../shared/images/title_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
-)
-set_source_files_properties("../shared/images/title_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
-)
-set_source_files_properties("../shared/images/title_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
-)
 set(shared_resource_files
-    "images/button_normal_cap_left.png"
-    "images/button_normal_cap_right.png"
-    "images/button_normal_stretch.png"
-    "images/button_pressed_cap_left.png"
-    "images/button_pressed_cap_right.png"
-    "images/button_pressed_stretch.png"
-    "images/frame_bottom.png"
-    "images/frame_bottomleft.png"
-    "images/frame_bottomright.png"
-    "images/frame_left.png"
-    "images/frame_right.png"
-    "images/frame_top.png"
-    "images/frame_topleft.png"
-    "images/frame_topright.png"
-    "images/groupframe_bottom_left.png"
-    "images/groupframe_bottom_right.png"
-    "images/groupframe_bottom_stretch.png"
-    "images/groupframe_left_stretch.png"
-    "images/groupframe_right_stretch.png"
-    "images/groupframe_top_stretch.png"
-    "images/groupframe_topleft.png"
-    "images/groupframe_topright.png"
-    "images/line_dash_dot.png"
-    "images/line_dash_dot_dot.png"
-    "images/line_dashed.png"
-    "images/line_dotted.png"
-    "images/line_solid.png"
-    "images/radiobutton-on.png"
-    "images/radiobutton_off.png"
-    "images/radiobutton_on.png"
-    "images/slider_bar.png"
-    "images/slider_thumb_on.png"
-    "images/title_cap_left.png"
-    "images/title_cap_right.png"
-    "images/title_stretch.png"
+    "../shared/images/button_normal_cap_left.png"
+    "../shared/images/button_normal_cap_right.png"
+    "../shared/images/button_normal_stretch.png"
+    "../shared/images/button_pressed_cap_left.png"
+    "../shared/images/button_pressed_cap_right.png"
+    "../shared/images/button_pressed_stretch.png"
+    "../shared/images/frame_bottom.png"
+    "../shared/images/frame_bottomleft.png"
+    "../shared/images/frame_bottomright.png"
+    "../shared/images/frame_left.png"
+    "../shared/images/frame_right.png"
+    "../shared/images/frame_top.png"
+    "../shared/images/frame_topleft.png"
+    "../shared/images/frame_topright.png"
+    "../shared/images/groupframe_bottom_left.png"
+    "../shared/images/groupframe_bottom_right.png"
+    "../shared/images/groupframe_bottom_stretch.png"
+    "../shared/images/groupframe_left_stretch.png"
+    "../shared/images/groupframe_right_stretch.png"
+    "../shared/images/groupframe_top_stretch.png"
+    "../shared/images/groupframe_topleft.png"
+    "../shared/images/groupframe_topright.png"
+    "../shared/images/line_dash_dot.png"
+    "../shared/images/line_dash_dot_dot.png"
+    "../shared/images/line_dashed.png"
+    "../shared/images/line_dotted.png"
+    "../shared/images/line_solid.png"
+    "../shared/images/radiobutton-on.png"
+    "../shared/images/radiobutton_off.png"
+    "../shared/images/radiobutton_on.png"
+    "../shared/images/slider_bar.png"
+    "../shared/images/slider_thumb_on.png"
+    "../shared/images/title_cap_left.png"
+    "../shared/images/title_cap_right.png"
+    "../shared/images/title_stretch.png"
 )
 
 qt6_add_resources(affine "shared"
diff --git a/examples/widgets/painting/affine/CMakeLists.txt b/examples/widgets/painting/affine/CMakeLists.txt
index c3323693b8..2ae78afb92 100644
--- a/examples/widgets/painting/affine/CMakeLists.txt
+++ b/examples/widgets/painting/affine/CMakeLists.txt
@@ -52,147 +52,42 @@ target_link_libraries(affine PUBLIC
 
 
 # Resources:
-set_source_files_properties("../shared/images/button_normal_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_normal_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_normal_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_pressed_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
-)
-set_source_files_properties("../shared/images/frame_bottom.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
-)
-set_source_files_properties("../shared/images/frame_bottomleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
-)
-set_source_files_properties("../shared/images/frame_bottomright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
-)
-set_source_files_properties("../shared/images/frame_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
-)
-set_source_files_properties("../shared/images/frame_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
-)
-set_source_files_properties("../shared/images/frame_top.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
-)
-set_source_files_properties("../shared/images/frame_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
-)
-set_source_files_properties("../shared/images/frame_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_left_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_right_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_top_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
-)
-set_source_files_properties("../shared/images/groupframe_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
-)
-set_source_files_properties("../shared/images/line_dashed.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
-)
-set_source_files_properties("../shared/images/line_dotted.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
-)
-set_source_files_properties("../shared/images/line_solid.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
-)
-set_source_files_properties("../shared/images/radiobutton-on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
-)
-set_source_files_properties("../shared/images/radiobutton_off.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
-)
-set_source_files_properties("../shared/images/radiobutton_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
-)
-set_source_files_properties("../shared/images/slider_bar.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
-)
-set_source_files_properties("../shared/images/slider_thumb_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
-)
-set_source_files_properties("../shared/images/title_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
-)
-set_source_files_properties("../shared/images/title_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
-)
-set_source_files_properties("../shared/images/title_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
-)
 set(shared_resource_files
-    "images/button_normal_cap_left.png"
-    "images/button_normal_cap_right.png"
-    "images/button_normal_stretch.png"
-    "images/button_pressed_cap_left.png"
-    "images/button_pressed_cap_right.png"
-    "images/button_pressed_stretch.png"
-    "images/frame_bottom.png"
-    "images/frame_bottomleft.png"
-    "images/frame_bottomright.png"
-    "images/frame_left.png"
-    "images/frame_right.png"
-    "images/frame_top.png"
-    "images/frame_topleft.png"
-    "images/frame_topright.png"
-    "images/groupframe_bottom_left.png"
-    "images/groupframe_bottom_right.png"
-    "images/groupframe_bottom_stretch.png"
-    "images/groupframe_left_stretch.png"
-    "images/groupframe_right_stretch.png"
-    "images/groupframe_top_stretch.png"
-    "images/groupframe_topleft.png"
-    "images/groupframe_topright.png"
-    "images/line_dash_dot.png"
-    "images/line_dash_dot_dot.png"
-    "images/line_dashed.png"
-    "images/line_dotted.png"
-    "images/line_solid.png"
-    "images/radiobutton-on.png"
-    "images/radiobutton_off.png"
-    "images/radiobutton_on.png"
-    "images/slider_bar.png"
-    "images/slider_thumb_on.png"
-    "images/title_cap_left.png"
-    "images/title_cap_right.png"
-    "images/title_stretch.png"
+    "../shared/images/button_normal_cap_left.png"
+    "../shared/images/button_normal_cap_right.png"
+    "../shared/images/button_normal_stretch.png"
+    "../shared/images/button_pressed_cap_left.png"
+    "../shared/images/button_pressed_cap_right.png"
+    "../shared/images/button_pressed_stretch.png"
+    "../shared/images/frame_bottom.png"
+    "../shared/images/frame_bottomleft.png"
+    "../shared/images/frame_bottomright.png"
+    "../shared/images/frame_left.png"
+    "../shared/images/frame_right.png"
+    "../shared/images/frame_top.png"
+    "../shared/images/frame_topleft.png"
+    "../shared/images/frame_topright.png"
+    "../shared/images/groupframe_bottom_left.png"
+    "../shared/images/groupframe_bottom_right.png"
+    "../shared/images/groupframe_bottom_stretch.png"
+    "../shared/images/groupframe_left_stretch.png"
+    "../shared/images/groupframe_right_stretch.png"
+    "../shared/images/groupframe_top_stretch.png"
+    "../shared/images/groupframe_topleft.png"
+    "../shared/images/groupframe_topright.png"
+    "../shared/images/line_dash_dot.png"
+    "../shared/images/line_dash_dot_dot.png"
+    "../shared/images/line_dashed.png"
+    "../shared/images/line_dotted.png"
+    "../shared/images/line_solid.png"
+    "../shared/images/radiobutton-on.png"
+    "../shared/images/radiobutton_off.png"
+    "../shared/images/radiobutton_on.png"
+    "../shared/images/slider_bar.png"
+    "../shared/images/slider_thumb_on.png"
+    "../shared/images/title_cap_left.png"
+    "../shared/images/title_cap_right.png"
+    "../shared/images/title_stretch.png"
 )
 
 qt6_add_resources(affine "shared"
diff --git a/examples/widgets/painting/composition/.prev_CMakeLists.txt b/examples/widgets/painting/composition/.prev_CMakeLists.txt
index 5e3cb8c10c..7cf2aab45f 100644
--- a/examples/widgets/painting/composition/.prev_CMakeLists.txt
+++ b/examples/widgets/painting/composition/.prev_CMakeLists.txt
@@ -42,147 +42,42 @@ target_link_libraries(composition PUBLIC
 
 
 # Resources:
-set_source_files_properties("../shared/images/button_normal_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_normal_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_normal_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_pressed_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
-)
-set_source_files_properties("../shared/images/frame_bottom.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
-)
-set_source_files_properties("../shared/images/frame_bottomleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
-)
-set_source_files_properties("../shared/images/frame_bottomright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
-)
-set_source_files_properties("../shared/images/frame_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
-)
-set_source_files_properties("../shared/images/frame_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
-)
-set_source_files_properties("../shared/images/frame_top.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
-)
-set_source_files_properties("../shared/images/frame_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
-)
-set_source_files_properties("../shared/images/frame_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_left_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_right_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_top_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
-)
-set_source_files_properties("../shared/images/groupframe_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
-)
-set_source_files_properties("../shared/images/line_dashed.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
-)
-set_source_files_properties("../shared/images/line_dotted.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
-)
-set_source_files_properties("../shared/images/line_solid.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
-)
-set_source_files_properties("../shared/images/radiobutton-on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
-)
-set_source_files_properties("../shared/images/radiobutton_off.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
-)
-set_source_files_properties("../shared/images/radiobutton_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
-)
-set_source_files_properties("../shared/images/slider_bar.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
-)
-set_source_files_properties("../shared/images/slider_thumb_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
-)
-set_source_files_properties("../shared/images/title_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
-)
-set_source_files_properties("../shared/images/title_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
-)
-set_source_files_properties("../shared/images/title_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
-)
 set(shared_resource_files
-    "images/button_normal_cap_left.png"
-    "images/button_normal_cap_right.png"
-    "images/button_normal_stretch.png"
-    "images/button_pressed_cap_left.png"
-    "images/button_pressed_cap_right.png"
-    "images/button_pressed_stretch.png"
-    "images/frame_bottom.png"
-    "images/frame_bottomleft.png"
-    "images/frame_bottomright.png"
-    "images/frame_left.png"
-    "images/frame_right.png"
-    "images/frame_top.png"
-    "images/frame_topleft.png"
-    "images/frame_topright.png"
-    "images/groupframe_bottom_left.png"
-    "images/groupframe_bottom_right.png"
-    "images/groupframe_bottom_stretch.png"
-    "images/groupframe_left_stretch.png"
-    "images/groupframe_right_stretch.png"
-    "images/groupframe_top_stretch.png"
-    "images/groupframe_topleft.png"
-    "images/groupframe_topright.png"
-    "images/line_dash_dot.png"
-    "images/line_dash_dot_dot.png"
-    "images/line_dashed.png"
-    "images/line_dotted.png"
-    "images/line_solid.png"
-    "images/radiobutton-on.png"
-    "images/radiobutton_off.png"
-    "images/radiobutton_on.png"
-    "images/slider_bar.png"
-    "images/slider_thumb_on.png"
-    "images/title_cap_left.png"
-    "images/title_cap_right.png"
-    "images/title_stretch.png"
+    "../shared/images/button_normal_cap_left.png"
+    "../shared/images/button_normal_cap_right.png"
+    "../shared/images/button_normal_stretch.png"
+    "../shared/images/button_pressed_cap_left.png"
+    "../shared/images/button_pressed_cap_right.png"
+    "../shared/images/button_pressed_stretch.png"
+    "../shared/images/frame_bottom.png"
+    "../shared/images/frame_bottomleft.png"
+    "../shared/images/frame_bottomright.png"
+    "../shared/images/frame_left.png"
+    "../shared/images/frame_right.png"
+    "../shared/images/frame_top.png"
+    "../shared/images/frame_topleft.png"
+    "../shared/images/frame_topright.png"
+    "../shared/images/groupframe_bottom_left.png"
+    "../shared/images/groupframe_bottom_right.png"
+    "../shared/images/groupframe_bottom_stretch.png"
+    "../shared/images/groupframe_left_stretch.png"
+    "../shared/images/groupframe_right_stretch.png"
+    "../shared/images/groupframe_top_stretch.png"
+    "../shared/images/groupframe_topleft.png"
+    "../shared/images/groupframe_topright.png"
+    "../shared/images/line_dash_dot.png"
+    "../shared/images/line_dash_dot_dot.png"
+    "../shared/images/line_dashed.png"
+    "../shared/images/line_dotted.png"
+    "../shared/images/line_solid.png"
+    "../shared/images/radiobutton-on.png"
+    "../shared/images/radiobutton_off.png"
+    "../shared/images/radiobutton_on.png"
+    "../shared/images/slider_bar.png"
+    "../shared/images/slider_thumb_on.png"
+    "../shared/images/title_cap_left.png"
+    "../shared/images/title_cap_right.png"
+    "../shared/images/title_stretch.png"
 )
 
 qt6_add_resources(composition "shared"
diff --git a/examples/widgets/painting/composition/CMakeLists.txt b/examples/widgets/painting/composition/CMakeLists.txt
index 8192439737..90a6e1dd77 100644
--- a/examples/widgets/painting/composition/CMakeLists.txt
+++ b/examples/widgets/painting/composition/CMakeLists.txt
@@ -52,147 +52,42 @@ target_link_libraries(composition PUBLIC
 
 
 # Resources:
-set_source_files_properties("../shared/images/button_normal_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_normal_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_normal_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_pressed_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
-)
-set_source_files_properties("../shared/images/frame_bottom.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
-)
-set_source_files_properties("../shared/images/frame_bottomleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
-)
-set_source_files_properties("../shared/images/frame_bottomright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
-)
-set_source_files_properties("../shared/images/frame_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
-)
-set_source_files_properties("../shared/images/frame_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
-)
-set_source_files_properties("../shared/images/frame_top.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
-)
-set_source_files_properties("../shared/images/frame_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
-)
-set_source_files_properties("../shared/images/frame_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_left_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_right_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_top_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
-)
-set_source_files_properties("../shared/images/groupframe_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
-)
-set_source_files_properties("../shared/images/line_dashed.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
-)
-set_source_files_properties("../shared/images/line_dotted.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
-)
-set_source_files_properties("../shared/images/line_solid.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
-)
-set_source_files_properties("../shared/images/radiobutton-on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
-)
-set_source_files_properties("../shared/images/radiobutton_off.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
-)
-set_source_files_properties("../shared/images/radiobutton_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
-)
-set_source_files_properties("../shared/images/slider_bar.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
-)
-set_source_files_properties("../shared/images/slider_thumb_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
-)
-set_source_files_properties("../shared/images/title_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
-)
-set_source_files_properties("../shared/images/title_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
-)
-set_source_files_properties("../shared/images/title_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
-)
 set(shared_resource_files
-    "images/button_normal_cap_left.png"
-    "images/button_normal_cap_right.png"
-    "images/button_normal_stretch.png"
-    "images/button_pressed_cap_left.png"
-    "images/button_pressed_cap_right.png"
-    "images/button_pressed_stretch.png"
-    "images/frame_bottom.png"
-    "images/frame_bottomleft.png"
-    "images/frame_bottomright.png"
-    "images/frame_left.png"
-    "images/frame_right.png"
-    "images/frame_top.png"
-    "images/frame_topleft.png"
-    "images/frame_topright.png"
-    "images/groupframe_bottom_left.png"
-    "images/groupframe_bottom_right.png"
-    "images/groupframe_bottom_stretch.png"
-    "images/groupframe_left_stretch.png"
-    "images/groupframe_right_stretch.png"
-    "images/groupframe_top_stretch.png"
-    "images/groupframe_topleft.png"
-    "images/groupframe_topright.png"
-    "images/line_dash_dot.png"
-    "images/line_dash_dot_dot.png"
-    "images/line_dashed.png"
-    "images/line_dotted.png"
-    "images/line_solid.png"
-    "images/radiobutton-on.png"
-    "images/radiobutton_off.png"
-    "images/radiobutton_on.png"
-    "images/slider_bar.png"
-    "images/slider_thumb_on.png"
-    "images/title_cap_left.png"
-    "images/title_cap_right.png"
-    "images/title_stretch.png"
+    "../shared/images/button_normal_cap_left.png"
+    "../shared/images/button_normal_cap_right.png"
+    "../shared/images/button_normal_stretch.png"
+    "../shared/images/button_pressed_cap_left.png"
+    "../shared/images/button_pressed_cap_right.png"
+    "../shared/images/button_pressed_stretch.png"
+    "../shared/images/frame_bottom.png"
+    "../shared/images/frame_bottomleft.png"
+    "../shared/images/frame_bottomright.png"
+    "../shared/images/frame_left.png"
+    "../shared/images/frame_right.png"
+    "../shared/images/frame_top.png"
+    "../shared/images/frame_topleft.png"
+    "../shared/images/frame_topright.png"
+    "../shared/images/groupframe_bottom_left.png"
+    "../shared/images/groupframe_bottom_right.png"
+    "../shared/images/groupframe_bottom_stretch.png"
+    "../shared/images/groupframe_left_stretch.png"
+    "../shared/images/groupframe_right_stretch.png"
+    "../shared/images/groupframe_top_stretch.png"
+    "../shared/images/groupframe_topleft.png"
+    "../shared/images/groupframe_topright.png"
+    "../shared/images/line_dash_dot.png"
+    "../shared/images/line_dash_dot_dot.png"
+    "../shared/images/line_dashed.png"
+    "../shared/images/line_dotted.png"
+    "../shared/images/line_solid.png"
+    "../shared/images/radiobutton-on.png"
+    "../shared/images/radiobutton_off.png"
+    "../shared/images/radiobutton_on.png"
+    "../shared/images/slider_bar.png"
+    "../shared/images/slider_thumb_on.png"
+    "../shared/images/title_cap_left.png"
+    "../shared/images/title_cap_right.png"
+    "../shared/images/title_stretch.png"
 )
 
 qt6_add_resources(composition "shared"
diff --git a/examples/widgets/painting/deform/.prev_CMakeLists.txt b/examples/widgets/painting/deform/.prev_CMakeLists.txt
index 4462680de7..c99df00a5a 100644
--- a/examples/widgets/painting/deform/.prev_CMakeLists.txt
+++ b/examples/widgets/painting/deform/.prev_CMakeLists.txt
@@ -42,147 +42,42 @@ target_link_libraries(deform PUBLIC
 
 
 # Resources:
-set_source_files_properties("../shared/images/button_normal_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_normal_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_normal_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_pressed_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
-)
-set_source_files_properties("../shared/images/frame_bottom.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
-)
-set_source_files_properties("../shared/images/frame_bottomleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
-)
-set_source_files_properties("../shared/images/frame_bottomright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
-)
-set_source_files_properties("../shared/images/frame_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
-)
-set_source_files_properties("../shared/images/frame_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
-)
-set_source_files_properties("../shared/images/frame_top.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
-)
-set_source_files_properties("../shared/images/frame_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
-)
-set_source_files_properties("../shared/images/frame_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_left_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_right_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_top_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
-)
-set_source_files_properties("../shared/images/groupframe_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
-)
-set_source_files_properties("../shared/images/line_dashed.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
-)
-set_source_files_properties("../shared/images/line_dotted.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
-)
-set_source_files_properties("../shared/images/line_solid.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
-)
-set_source_files_properties("../shared/images/radiobutton-on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
-)
-set_source_files_properties("../shared/images/radiobutton_off.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
-)
-set_source_files_properties("../shared/images/radiobutton_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
-)
-set_source_files_properties("../shared/images/slider_bar.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
-)
-set_source_files_properties("../shared/images/slider_thumb_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
-)
-set_source_files_properties("../shared/images/title_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
-)
-set_source_files_properties("../shared/images/title_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
-)
-set_source_files_properties("../shared/images/title_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
-)
 set(shared_resource_files
-    "images/button_normal_cap_left.png"
-    "images/button_normal_cap_right.png"
-    "images/button_normal_stretch.png"
-    "images/button_pressed_cap_left.png"
-    "images/button_pressed_cap_right.png"
-    "images/button_pressed_stretch.png"
-    "images/frame_bottom.png"
-    "images/frame_bottomleft.png"
-    "images/frame_bottomright.png"
-    "images/frame_left.png"
-    "images/frame_right.png"
-    "images/frame_top.png"
-    "images/frame_topleft.png"
-    "images/frame_topright.png"
-    "images/groupframe_bottom_left.png"
-    "images/groupframe_bottom_right.png"
-    "images/groupframe_bottom_stretch.png"
-    "images/groupframe_left_stretch.png"
-    "images/groupframe_right_stretch.png"
-    "images/groupframe_top_stretch.png"
-    "images/groupframe_topleft.png"
-    "images/groupframe_topright.png"
-    "images/line_dash_dot.png"
-    "images/line_dash_dot_dot.png"
-    "images/line_dashed.png"
-    "images/line_dotted.png"
-    "images/line_solid.png"
-    "images/radiobutton-on.png"
-    "images/radiobutton_off.png"
-    "images/radiobutton_on.png"
-    "images/slider_bar.png"
-    "images/slider_thumb_on.png"
-    "images/title_cap_left.png"
-    "images/title_cap_right.png"
-    "images/title_stretch.png"
+    "../shared/images/button_normal_cap_left.png"
+    "../shared/images/button_normal_cap_right.png"
+    "../shared/images/button_normal_stretch.png"
+    "../shared/images/button_pressed_cap_left.png"
+    "../shared/images/button_pressed_cap_right.png"
+    "../shared/images/button_pressed_stretch.png"
+    "../shared/images/frame_bottom.png"
+    "../shared/images/frame_bottomleft.png"
+    "../shared/images/frame_bottomright.png"
+    "../shared/images/frame_left.png"
+    "../shared/images/frame_right.png"
+    "../shared/images/frame_top.png"
+    "../shared/images/frame_topleft.png"
+    "../shared/images/frame_topright.png"
+    "../shared/images/groupframe_bottom_left.png"
+    "../shared/images/groupframe_bottom_right.png"
+    "../shared/images/groupframe_bottom_stretch.png"
+    "../shared/images/groupframe_left_stretch.png"
+    "../shared/images/groupframe_right_stretch.png"
+    "../shared/images/groupframe_top_stretch.png"
+    "../shared/images/groupframe_topleft.png"
+    "../shared/images/groupframe_topright.png"
+    "../shared/images/line_dash_dot.png"
+    "../shared/images/line_dash_dot_dot.png"
+    "../shared/images/line_dashed.png"
+    "../shared/images/line_dotted.png"
+    "../shared/images/line_solid.png"
+    "../shared/images/radiobutton-on.png"
+    "../shared/images/radiobutton_off.png"
+    "../shared/images/radiobutton_on.png"
+    "../shared/images/slider_bar.png"
+    "../shared/images/slider_thumb_on.png"
+    "../shared/images/title_cap_left.png"
+    "../shared/images/title_cap_right.png"
+    "../shared/images/title_stretch.png"
 )
 
 qt6_add_resources(deform "shared"
diff --git a/examples/widgets/painting/deform/CMakeLists.txt b/examples/widgets/painting/deform/CMakeLists.txt
index c2517ac66f..5993a9757c 100644
--- a/examples/widgets/painting/deform/CMakeLists.txt
+++ b/examples/widgets/painting/deform/CMakeLists.txt
@@ -52,147 +52,42 @@ target_link_libraries(deform PUBLIC
 
 
 # Resources:
-set_source_files_properties("../shared/images/button_normal_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_normal_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_normal_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_pressed_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
-)
-set_source_files_properties("../shared/images/frame_bottom.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
-)
-set_source_files_properties("../shared/images/frame_bottomleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
-)
-set_source_files_properties("../shared/images/frame_bottomright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
-)
-set_source_files_properties("../shared/images/frame_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
-)
-set_source_files_properties("../shared/images/frame_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
-)
-set_source_files_properties("../shared/images/frame_top.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
-)
-set_source_files_properties("../shared/images/frame_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
-)
-set_source_files_properties("../shared/images/frame_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_left_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_right_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_top_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
-)
-set_source_files_properties("../shared/images/groupframe_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
-)
-set_source_files_properties("../shared/images/line_dashed.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
-)
-set_source_files_properties("../shared/images/line_dotted.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
-)
-set_source_files_properties("../shared/images/line_solid.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
-)
-set_source_files_properties("../shared/images/radiobutton-on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
-)
-set_source_files_properties("../shared/images/radiobutton_off.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
-)
-set_source_files_properties("../shared/images/radiobutton_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
-)
-set_source_files_properties("../shared/images/slider_bar.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
-)
-set_source_files_properties("../shared/images/slider_thumb_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
-)
-set_source_files_properties("../shared/images/title_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
-)
-set_source_files_properties("../shared/images/title_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
-)
-set_source_files_properties("../shared/images/title_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
-)
 set(shared_resource_files
-    "images/button_normal_cap_left.png"
-    "images/button_normal_cap_right.png"
-    "images/button_normal_stretch.png"
-    "images/button_pressed_cap_left.png"
-    "images/button_pressed_cap_right.png"
-    "images/button_pressed_stretch.png"
-    "images/frame_bottom.png"
-    "images/frame_bottomleft.png"
-    "images/frame_bottomright.png"
-    "images/frame_left.png"
-    "images/frame_right.png"
-    "images/frame_top.png"
-    "images/frame_topleft.png"
-    "images/frame_topright.png"
-    "images/groupframe_bottom_left.png"
-    "images/groupframe_bottom_right.png"
-    "images/groupframe_bottom_stretch.png"
-    "images/groupframe_left_stretch.png"
-    "images/groupframe_right_stretch.png"
-    "images/groupframe_top_stretch.png"
-    "images/groupframe_topleft.png"
-    "images/groupframe_topright.png"
-    "images/line_dash_dot.png"
-    "images/line_dash_dot_dot.png"
-    "images/line_dashed.png"
-    "images/line_dotted.png"
-    "images/line_solid.png"
-    "images/radiobutton-on.png"
-    "images/radiobutton_off.png"
-    "images/radiobutton_on.png"
-    "images/slider_bar.png"
-    "images/slider_thumb_on.png"
-    "images/title_cap_left.png"
-    "images/title_cap_right.png"
-    "images/title_stretch.png"
+    "../shared/images/button_normal_cap_left.png"
+    "../shared/images/button_normal_cap_right.png"
+    "../shared/images/button_normal_stretch.png"
+    "../shared/images/button_pressed_cap_left.png"
+    "../shared/images/button_pressed_cap_right.png"
+    "../shared/images/button_pressed_stretch.png"
+    "../shared/images/frame_bottom.png"
+    "../shared/images/frame_bottomleft.png"
+    "../shared/images/frame_bottomright.png"
+    "../shared/images/frame_left.png"
+    "../shared/images/frame_right.png"
+    "../shared/images/frame_top.png"
+    "../shared/images/frame_topleft.png"
+    "../shared/images/frame_topright.png"
+    "../shared/images/groupframe_bottom_left.png"
+    "../shared/images/groupframe_bottom_right.png"
+    "../shared/images/groupframe_bottom_stretch.png"
+    "../shared/images/groupframe_left_stretch.png"
+    "../shared/images/groupframe_right_stretch.png"
+    "../shared/images/groupframe_top_stretch.png"
+    "../shared/images/groupframe_topleft.png"
+    "../shared/images/groupframe_topright.png"
+    "../shared/images/line_dash_dot.png"
+    "../shared/images/line_dash_dot_dot.png"
+    "../shared/images/line_dashed.png"
+    "../shared/images/line_dotted.png"
+    "../shared/images/line_solid.png"
+    "../shared/images/radiobutton-on.png"
+    "../shared/images/radiobutton_off.png"
+    "../shared/images/radiobutton_on.png"
+    "../shared/images/slider_bar.png"
+    "../shared/images/slider_thumb_on.png"
+    "../shared/images/title_cap_left.png"
+    "../shared/images/title_cap_right.png"
+    "../shared/images/title_stretch.png"
 )
 
 qt6_add_resources(deform "shared"
diff --git a/examples/widgets/painting/gradients/.prev_CMakeLists.txt b/examples/widgets/painting/gradients/.prev_CMakeLists.txt
index 7e798d032e..1260b18089 100644
--- a/examples/widgets/painting/gradients/.prev_CMakeLists.txt
+++ b/examples/widgets/painting/gradients/.prev_CMakeLists.txt
@@ -42,147 +42,42 @@ target_link_libraries(gradients PUBLIC
 
 
 # Resources:
-set_source_files_properties("../shared/images/button_normal_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_normal_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_normal_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_pressed_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
-)
-set_source_files_properties("../shared/images/frame_bottom.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
-)
-set_source_files_properties("../shared/images/frame_bottomleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
-)
-set_source_files_properties("../shared/images/frame_bottomright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
-)
-set_source_files_properties("../shared/images/frame_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
-)
-set_source_files_properties("../shared/images/frame_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
-)
-set_source_files_properties("../shared/images/frame_top.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
-)
-set_source_files_properties("../shared/images/frame_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
-)
-set_source_files_properties("../shared/images/frame_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_left_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_right_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_top_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
-)
-set_source_files_properties("../shared/images/groupframe_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
-)
-set_source_files_properties("../shared/images/line_dashed.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
-)
-set_source_files_properties("../shared/images/line_dotted.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
-)
-set_source_files_properties("../shared/images/line_solid.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
-)
-set_source_files_properties("../shared/images/radiobutton-on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
-)
-set_source_files_properties("../shared/images/radiobutton_off.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
-)
-set_source_files_properties("../shared/images/radiobutton_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
-)
-set_source_files_properties("../shared/images/slider_bar.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
-)
-set_source_files_properties("../shared/images/slider_thumb_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
-)
-set_source_files_properties("../shared/images/title_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
-)
-set_source_files_properties("../shared/images/title_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
-)
-set_source_files_properties("../shared/images/title_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
-)
 set(shared_resource_files
-    "images/button_normal_cap_left.png"
-    "images/button_normal_cap_right.png"
-    "images/button_normal_stretch.png"
-    "images/button_pressed_cap_left.png"
-    "images/button_pressed_cap_right.png"
-    "images/button_pressed_stretch.png"
-    "images/frame_bottom.png"
-    "images/frame_bottomleft.png"
-    "images/frame_bottomright.png"
-    "images/frame_left.png"
-    "images/frame_right.png"
-    "images/frame_top.png"
-    "images/frame_topleft.png"
-    "images/frame_topright.png"
-    "images/groupframe_bottom_left.png"
-    "images/groupframe_bottom_right.png"
-    "images/groupframe_bottom_stretch.png"
-    "images/groupframe_left_stretch.png"
-    "images/groupframe_right_stretch.png"
-    "images/groupframe_top_stretch.png"
-    "images/groupframe_topleft.png"
-    "images/groupframe_topright.png"
-    "images/line_dash_dot.png"
-    "images/line_dash_dot_dot.png"
-    "images/line_dashed.png"
-    "images/line_dotted.png"
-    "images/line_solid.png"
-    "images/radiobutton-on.png"
-    "images/radiobutton_off.png"
-    "images/radiobutton_on.png"
-    "images/slider_bar.png"
-    "images/slider_thumb_on.png"
-    "images/title_cap_left.png"
-    "images/title_cap_right.png"
-    "images/title_stretch.png"
+    "../shared/images/button_normal_cap_left.png"
+    "../shared/images/button_normal_cap_right.png"
+    "../shared/images/button_normal_stretch.png"
+    "../shared/images/button_pressed_cap_left.png"
+    "../shared/images/button_pressed_cap_right.png"
+    "../shared/images/button_pressed_stretch.png"
+    "../shared/images/frame_bottom.png"
+    "../shared/images/frame_bottomleft.png"
+    "../shared/images/frame_bottomright.png"
+    "../shared/images/frame_left.png"
+    "../shared/images/frame_right.png"
+    "../shared/images/frame_top.png"
+    "../shared/images/frame_topleft.png"
+    "../shared/images/frame_topright.png"
+    "../shared/images/groupframe_bottom_left.png"
+    "../shared/images/groupframe_bottom_right.png"
+    "../shared/images/groupframe_bottom_stretch.png"
+    "../shared/images/groupframe_left_stretch.png"
+    "../shared/images/groupframe_right_stretch.png"
+    "../shared/images/groupframe_top_stretch.png"
+    "../shared/images/groupframe_topleft.png"
+    "../shared/images/groupframe_topright.png"
+    "../shared/images/line_dash_dot.png"
+    "../shared/images/line_dash_dot_dot.png"
+    "../shared/images/line_dashed.png"
+    "../shared/images/line_dotted.png"
+    "../shared/images/line_solid.png"
+    "../shared/images/radiobutton-on.png"
+    "../shared/images/radiobutton_off.png"
+    "../shared/images/radiobutton_on.png"
+    "../shared/images/slider_bar.png"
+    "../shared/images/slider_thumb_on.png"
+    "../shared/images/title_cap_left.png"
+    "../shared/images/title_cap_right.png"
+    "../shared/images/title_stretch.png"
 )
 
 qt6_add_resources(gradients "shared"
diff --git a/examples/widgets/painting/gradients/CMakeLists.txt b/examples/widgets/painting/gradients/CMakeLists.txt
index 6ad4dfa771..3c787e9c88 100644
--- a/examples/widgets/painting/gradients/CMakeLists.txt
+++ b/examples/widgets/painting/gradients/CMakeLists.txt
@@ -52,147 +52,42 @@ target_link_libraries(gradients PUBLIC
 
 
 # Resources:
-set_source_files_properties("../shared/images/button_normal_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_normal_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_normal_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_pressed_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
-)
-set_source_files_properties("../shared/images/frame_bottom.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
-)
-set_source_files_properties("../shared/images/frame_bottomleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
-)
-set_source_files_properties("../shared/images/frame_bottomright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
-)
-set_source_files_properties("../shared/images/frame_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
-)
-set_source_files_properties("../shared/images/frame_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
-)
-set_source_files_properties("../shared/images/frame_top.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
-)
-set_source_files_properties("../shared/images/frame_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
-)
-set_source_files_properties("../shared/images/frame_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_left_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_right_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_top_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
-)
-set_source_files_properties("../shared/images/groupframe_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
-)
-set_source_files_properties("../shared/images/line_dashed.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
-)
-set_source_files_properties("../shared/images/line_dotted.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
-)
-set_source_files_properties("../shared/images/line_solid.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
-)
-set_source_files_properties("../shared/images/radiobutton-on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
-)
-set_source_files_properties("../shared/images/radiobutton_off.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
-)
-set_source_files_properties("../shared/images/radiobutton_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
-)
-set_source_files_properties("../shared/images/slider_bar.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
-)
-set_source_files_properties("../shared/images/slider_thumb_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
-)
-set_source_files_properties("../shared/images/title_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
-)
-set_source_files_properties("../shared/images/title_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
-)
-set_source_files_properties("../shared/images/title_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
-)
 set(shared_resource_files
-    "images/button_normal_cap_left.png"
-    "images/button_normal_cap_right.png"
-    "images/button_normal_stretch.png"
-    "images/button_pressed_cap_left.png"
-    "images/button_pressed_cap_right.png"
-    "images/button_pressed_stretch.png"
-    "images/frame_bottom.png"
-    "images/frame_bottomleft.png"
-    "images/frame_bottomright.png"
-    "images/frame_left.png"
-    "images/frame_right.png"
-    "images/frame_top.png"
-    "images/frame_topleft.png"
-    "images/frame_topright.png"
-    "images/groupframe_bottom_left.png"
-    "images/groupframe_bottom_right.png"
-    "images/groupframe_bottom_stretch.png"
-    "images/groupframe_left_stretch.png"
-    "images/groupframe_right_stretch.png"
-    "images/groupframe_top_stretch.png"
-    "images/groupframe_topleft.png"
-    "images/groupframe_topright.png"
-    "images/line_dash_dot.png"
-    "images/line_dash_dot_dot.png"
-    "images/line_dashed.png"
-    "images/line_dotted.png"
-    "images/line_solid.png"
-    "images/radiobutton-on.png"
-    "images/radiobutton_off.png"
-    "images/radiobutton_on.png"
-    "images/slider_bar.png"
-    "images/slider_thumb_on.png"
-    "images/title_cap_left.png"
-    "images/title_cap_right.png"
-    "images/title_stretch.png"
+    "../shared/images/button_normal_cap_left.png"
+    "../shared/images/button_normal_cap_right.png"
+    "../shared/images/button_normal_stretch.png"
+    "../shared/images/button_pressed_cap_left.png"
+    "../shared/images/button_pressed_cap_right.png"
+    "../shared/images/button_pressed_stretch.png"
+    "../shared/images/frame_bottom.png"
+    "../shared/images/frame_bottomleft.png"
+    "../shared/images/frame_bottomright.png"
+    "../shared/images/frame_left.png"
+    "../shared/images/frame_right.png"
+    "../shared/images/frame_top.png"
+    "../shared/images/frame_topleft.png"
+    "../shared/images/frame_topright.png"
+    "../shared/images/groupframe_bottom_left.png"
+    "../shared/images/groupframe_bottom_right.png"
+    "../shared/images/groupframe_bottom_stretch.png"
+    "../shared/images/groupframe_left_stretch.png"
+    "../shared/images/groupframe_right_stretch.png"
+    "../shared/images/groupframe_top_stretch.png"
+    "../shared/images/groupframe_topleft.png"
+    "../shared/images/groupframe_topright.png"
+    "../shared/images/line_dash_dot.png"
+    "../shared/images/line_dash_dot_dot.png"
+    "../shared/images/line_dashed.png"
+    "../shared/images/line_dotted.png"
+    "../shared/images/line_solid.png"
+    "../shared/images/radiobutton-on.png"
+    "../shared/images/radiobutton_off.png"
+    "../shared/images/radiobutton_on.png"
+    "../shared/images/slider_bar.png"
+    "../shared/images/slider_thumb_on.png"
+    "../shared/images/title_cap_left.png"
+    "../shared/images/title_cap_right.png"
+    "../shared/images/title_stretch.png"
 )
 
 qt6_add_resources(gradients "shared"
diff --git a/examples/widgets/painting/pathstroke/.prev_CMakeLists.txt b/examples/widgets/painting/pathstroke/.prev_CMakeLists.txt
index 22a6635164..e2c1d5f793 100644
--- a/examples/widgets/painting/pathstroke/.prev_CMakeLists.txt
+++ b/examples/widgets/painting/pathstroke/.prev_CMakeLists.txt
@@ -42,147 +42,42 @@ target_link_libraries(pathstroke PUBLIC
 
 
 # Resources:
-set_source_files_properties("../shared/images/button_normal_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_normal_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_normal_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_pressed_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
-)
-set_source_files_properties("../shared/images/frame_bottom.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
-)
-set_source_files_properties("../shared/images/frame_bottomleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
-)
-set_source_files_properties("../shared/images/frame_bottomright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
-)
-set_source_files_properties("../shared/images/frame_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
-)
-set_source_files_properties("../shared/images/frame_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
-)
-set_source_files_properties("../shared/images/frame_top.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
-)
-set_source_files_properties("../shared/images/frame_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
-)
-set_source_files_properties("../shared/images/frame_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_left_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_right_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_top_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
-)
-set_source_files_properties("../shared/images/groupframe_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
-)
-set_source_files_properties("../shared/images/line_dashed.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
-)
-set_source_files_properties("../shared/images/line_dotted.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
-)
-set_source_files_properties("../shared/images/line_solid.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
-)
-set_source_files_properties("../shared/images/radiobutton-on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
-)
-set_source_files_properties("../shared/images/radiobutton_off.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
-)
-set_source_files_properties("../shared/images/radiobutton_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
-)
-set_source_files_properties("../shared/images/slider_bar.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
-)
-set_source_files_properties("../shared/images/slider_thumb_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
-)
-set_source_files_properties("../shared/images/title_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
-)
-set_source_files_properties("../shared/images/title_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
-)
-set_source_files_properties("../shared/images/title_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
-)
 set(shared_resource_files
-    "images/button_normal_cap_left.png"
-    "images/button_normal_cap_right.png"
-    "images/button_normal_stretch.png"
-    "images/button_pressed_cap_left.png"
-    "images/button_pressed_cap_right.png"
-    "images/button_pressed_stretch.png"
-    "images/frame_bottom.png"
-    "images/frame_bottomleft.png"
-    "images/frame_bottomright.png"
-    "images/frame_left.png"
-    "images/frame_right.png"
-    "images/frame_top.png"
-    "images/frame_topleft.png"
-    "images/frame_topright.png"
-    "images/groupframe_bottom_left.png"
-    "images/groupframe_bottom_right.png"
-    "images/groupframe_bottom_stretch.png"
-    "images/groupframe_left_stretch.png"
-    "images/groupframe_right_stretch.png"
-    "images/groupframe_top_stretch.png"
-    "images/groupframe_topleft.png"
-    "images/groupframe_topright.png"
-    "images/line_dash_dot.png"
-    "images/line_dash_dot_dot.png"
-    "images/line_dashed.png"
-    "images/line_dotted.png"
-    "images/line_solid.png"
-    "images/radiobutton-on.png"
-    "images/radiobutton_off.png"
-    "images/radiobutton_on.png"
-    "images/slider_bar.png"
-    "images/slider_thumb_on.png"
-    "images/title_cap_left.png"
-    "images/title_cap_right.png"
-    "images/title_stretch.png"
+    "../shared/images/button_normal_cap_left.png"
+    "../shared/images/button_normal_cap_right.png"
+    "../shared/images/button_normal_stretch.png"
+    "../shared/images/button_pressed_cap_left.png"
+    "../shared/images/button_pressed_cap_right.png"
+    "../shared/images/button_pressed_stretch.png"
+    "../shared/images/frame_bottom.png"
+    "../shared/images/frame_bottomleft.png"
+    "../shared/images/frame_bottomright.png"
+    "../shared/images/frame_left.png"
+    "../shared/images/frame_right.png"
+    "../shared/images/frame_top.png"
+    "../shared/images/frame_topleft.png"
+    "../shared/images/frame_topright.png"
+    "../shared/images/groupframe_bottom_left.png"
+    "../shared/images/groupframe_bottom_right.png"
+    "../shared/images/groupframe_bottom_stretch.png"
+    "../shared/images/groupframe_left_stretch.png"
+    "../shared/images/groupframe_right_stretch.png"
+    "../shared/images/groupframe_top_stretch.png"
+    "../shared/images/groupframe_topleft.png"
+    "../shared/images/groupframe_topright.png"
+    "../shared/images/line_dash_dot.png"
+    "../shared/images/line_dash_dot_dot.png"
+    "../shared/images/line_dashed.png"
+    "../shared/images/line_dotted.png"
+    "../shared/images/line_solid.png"
+    "../shared/images/radiobutton-on.png"
+    "../shared/images/radiobutton_off.png"
+    "../shared/images/radiobutton_on.png"
+    "../shared/images/slider_bar.png"
+    "../shared/images/slider_thumb_on.png"
+    "../shared/images/title_cap_left.png"
+    "../shared/images/title_cap_right.png"
+    "../shared/images/title_stretch.png"
 )
 
 qt6_add_resources(pathstroke "shared"
diff --git a/examples/widgets/painting/pathstroke/CMakeLists.txt b/examples/widgets/painting/pathstroke/CMakeLists.txt
index 17de61fede..8bdb9c8019 100644
--- a/examples/widgets/painting/pathstroke/CMakeLists.txt
+++ b/examples/widgets/painting/pathstroke/CMakeLists.txt
@@ -52,147 +52,42 @@ target_link_libraries(pathstroke PUBLIC
 
 
 # Resources:
-set_source_files_properties("../shared/images/button_normal_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_normal_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_normal_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
-)
-set_source_files_properties("../shared/images/button_pressed_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
-)
-set_source_files_properties("../shared/images/button_pressed_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
-)
-set_source_files_properties("../shared/images/frame_bottom.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
-)
-set_source_files_properties("../shared/images/frame_bottomleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
-)
-set_source_files_properties("../shared/images/frame_bottomright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
-)
-set_source_files_properties("../shared/images/frame_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
-)
-set_source_files_properties("../shared/images/frame_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
-)
-set_source_files_properties("../shared/images/frame_top.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
-)
-set_source_files_properties("../shared/images/frame_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
-)
-set_source_files_properties("../shared/images/frame_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
-)
-set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_left_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_right_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_top_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
-)
-set_source_files_properties("../shared/images/groupframe_topleft.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
-)
-set_source_files_properties("../shared/images/groupframe_topright.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
-)
-set_source_files_properties("../shared/images/line_dash_dot_dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
-)
-set_source_files_properties("../shared/images/line_dashed.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
-)
-set_source_files_properties("../shared/images/line_dotted.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
-)
-set_source_files_properties("../shared/images/line_solid.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
-)
-set_source_files_properties("../shared/images/radiobutton-on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
-)
-set_source_files_properties("../shared/images/radiobutton_off.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
-)
-set_source_files_properties("../shared/images/radiobutton_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
-)
-set_source_files_properties("../shared/images/slider_bar.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
-)
-set_source_files_properties("../shared/images/slider_thumb_on.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
-)
-set_source_files_properties("../shared/images/title_cap_left.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
-)
-set_source_files_properties("../shared/images/title_cap_right.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
-)
-set_source_files_properties("../shared/images/title_stretch.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
-)
 set(shared_resource_files
-    "images/button_normal_cap_left.png"
-    "images/button_normal_cap_right.png"
-    "images/button_normal_stretch.png"
-    "images/button_pressed_cap_left.png"
-    "images/button_pressed_cap_right.png"
-    "images/button_pressed_stretch.png"
-    "images/frame_bottom.png"
-    "images/frame_bottomleft.png"
-    "images/frame_bottomright.png"
-    "images/frame_left.png"
-    "images/frame_right.png"
-    "images/frame_top.png"
-    "images/frame_topleft.png"
-    "images/frame_topright.png"
-    "images/groupframe_bottom_left.png"
-    "images/groupframe_bottom_right.png"
-    "images/groupframe_bottom_stretch.png"
-    "images/groupframe_left_stretch.png"
-    "images/groupframe_right_stretch.png"
-    "images/groupframe_top_stretch.png"
-    "images/groupframe_topleft.png"
-    "images/groupframe_topright.png"
-    "images/line_dash_dot.png"
-    "images/line_dash_dot_dot.png"
-    "images/line_dashed.png"
-    "images/line_dotted.png"
-    "images/line_solid.png"
-    "images/radiobutton-on.png"
-    "images/radiobutton_off.png"
-    "images/radiobutton_on.png"
-    "images/slider_bar.png"
-    "images/slider_thumb_on.png"
-    "images/title_cap_left.png"
-    "images/title_cap_right.png"
-    "images/title_stretch.png"
+    "../shared/images/button_normal_cap_left.png"
+    "../shared/images/button_normal_cap_right.png"
+    "../shared/images/button_normal_stretch.png"
+    "../shared/images/button_pressed_cap_left.png"
+    "../shared/images/button_pressed_cap_right.png"
+    "../shared/images/button_pressed_stretch.png"
+    "../shared/images/frame_bottom.png"
+    "../shared/images/frame_bottomleft.png"
+    "../shared/images/frame_bottomright.png"
+    "../shared/images/frame_left.png"
+    "../shared/images/frame_right.png"
+    "../shared/images/frame_top.png"
+    "../shared/images/frame_topleft.png"
+    "../shared/images/frame_topright.png"
+    "../shared/images/groupframe_bottom_left.png"
+    "../shared/images/groupframe_bottom_right.png"
+    "../shared/images/groupframe_bottom_stretch.png"
+    "../shared/images/groupframe_left_stretch.png"
+    "../shared/images/groupframe_right_stretch.png"
+    "../shared/images/groupframe_top_stretch.png"
+    "../shared/images/groupframe_topleft.png"
+    "../shared/images/groupframe_topright.png"
+    "../shared/images/line_dash_dot.png"
+    "../shared/images/line_dash_dot_dot.png"
+    "../shared/images/line_dashed.png"
+    "../shared/images/line_dotted.png"
+    "../shared/images/line_solid.png"
+    "../shared/images/radiobutton-on.png"
+    "../shared/images/radiobutton_off.png"
+    "../shared/images/radiobutton_on.png"
+    "../shared/images/slider_bar.png"
+    "../shared/images/slider_thumb_on.png"
+    "../shared/images/title_cap_left.png"
+    "../shared/images/title_cap_right.png"
+    "../shared/images/title_stretch.png"
 )
 
 qt6_add_resources(pathstroke "shared"
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
index c683f2544f..3d04b3b788 100644
--- a/src/corelib/Qt6CoreMacros.cmake
+++ b/src/corelib/Qt6CoreMacros.cmake
@@ -1417,23 +1417,43 @@ function(_qt_internal_process_resource target resourceName)
     string(REPLACE "." "_" resourceName ${resourceName})
 
     set(output_targets "")
-    # Apply base to all files
-    if (rcc_BASE)
-        foreach(file IN LISTS rcc_FILES)
-            set(resource_file "${rcc_BASE}/${file}")
-            __qt_get_relative_resource_path_for_file(alias ${resource_file})
-            # Handle case where resources were generated from a directory
-            # different than the one where the main .pro file resides.
-            # Unless otherwise specified, we should use the original file path
-            # as alias.
-            if (alias STREQUAL resource_file)
-                set_source_files_properties(${resource_file} PROPERTIES QT_RESOURCE_ALIAS ${file})
-            endif()
-            file(TO_CMAKE_PATH ${resource_file} resource_file)
-            list(APPEND resource_files ${resource_file})
-        endforeach()
-    else()
+    if(NOT DEFINED QT_REPO_MODULE_VERSION OR QT_USE_FIXED_QT_ADD_RESOURCE_BASE)
+        # Use the fixed BASE argument instead of the slightly broken one from 6.0.
         set(resource_files ${rcc_FILES})
+        if(NOT "${rcc_BASE}" STREQUAL "")
+            get_filename_component(abs_base "${rcc_BASE}" ABSOLUTE)
+            foreach(file_path IN LISTS resource_files)
+                get_source_file_property(alias "${file_path}" QT_RESOURCE_ALIAS)
+                if(alias STREQUAL "NOTFOUND")
+                    get_filename_component(abs_file "${file_path}" ABSOLUTE)
+                    file(RELATIVE_PATH rel_file "${abs_base}" "${abs_file}")
+                    set_property(SOURCE "${file_path}" PROPERTY QT_RESOURCE_ALIAS "${rel_file}")
+                endif()
+            endforeach()
+        endif()
+    else()
+        # TODO: Remove this else branch, once every Qt module defines
+        #       QT_USE_FIXED_QT_ADD_RESOURCE_BASE.
+
+        # Apply base to all files
+        if (rcc_BASE)
+            foreach(file_path IN LISTS rcc_FILES)
+                set(resource_file "${rcc_BASE}/${file_path}")
+                __qt_get_relative_resource_path_for_file(alias ${resource_file})
+                # Handle case where resources were generated from a directory
+                # different than the one where the main .pro file resides.
+                # Unless otherwise specified, we should use the original file path
+                # as alias.
+                if (alias STREQUAL resource_file)
+                    set_source_files_properties(${resource_file} PROPERTIES
+                        QT_RESOURCE_ALIAS ${file_path})
+                endif()
+                file(TO_CMAKE_PATH ${resource_file} resource_file)
+                list(APPEND resource_files ${resource_file})
+            endforeach()
+        else()
+            set(resource_files ${rcc_FILES})
+        endif()
     endif()
 
     if(NOT rcc_PREFIX)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 33fbdec11f..bb21d1b976 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -282,12 +282,12 @@ qt_internal_add_module(Gui
 )
 
 # Resources:
-set_source_files_properties("painting/../../3rdparty/icc/sRGB2014.icc"
+set_source_files_properties("../3rdparty/icc/sRGB2014.icc"
     PROPERTIES QT_RESOURCE_ALIAS "sRGB2014.icc"
 )
 set(qpdf_resource_files
-    "../../3rdparty/icc/sRGB2014.icc"
-    "qpdfa_metadata.xml"
+    "../3rdparty/icc/sRGB2014.icc"
+    "painting/qpdfa_metadata.xml"
 )
 
 qt_internal_add_resource(Gui "qpdf"
diff --git a/src/plugins/platforms/direct2d/CMakeLists.txt b/src/plugins/platforms/direct2d/CMakeLists.txt
index 94c435ea69..04d317880f 100644
--- a/src/plugins/platforms/direct2d/CMakeLists.txt
+++ b/src/plugins/platforms/direct2d/CMakeLists.txt
@@ -79,14 +79,12 @@ set_source_files_properties("../windows/openglblacklists/default.json"
     PROPERTIES QT_RESOURCE_ALIAS "default.json"
 )
 set(openglblacklists_resource_files
-    "openglblacklists/default.json"
+    "../windows/openglblacklists/default.json"
 )
 
 qt_internal_add_resource(QWindowsDirect2DIntegrationPlugin "openglblacklists"
     PREFIX
         "/qt-project.org/windows/openglblacklists"
-    BASE
-        "../windows"
     FILES
         ${openglblacklists_resource_files}
 )
@@ -150,91 +148,28 @@ qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE
 
 if(QT_FEATURE_imageformat_png)
     # Resources:
-    set_source_files_properties("../windows/images/closedhandcursor_32.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/closedhandcursor_32.png"
-    )
-    set_source_files_properties("../windows/images/closedhandcursor_48.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/closedhandcursor_48.png"
-    )
-    set_source_files_properties("../windows/images/closedhandcursor_64.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/closedhandcursor_64.png"
-    )
-    set_source_files_properties("../windows/images/dragcopycursor_32.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/dragcopycursor_32.png"
-    )
-    set_source_files_properties("../windows/images/dragcopycursor_48.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/dragcopycursor_48.png"
-    )
-    set_source_files_properties("../windows/images/dragcopycursor_64.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/dragcopycursor_64.png"
-    )
-    set_source_files_properties("../windows/images/draglinkcursor_32.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/draglinkcursor_32.png"
-    )
-    set_source_files_properties("../windows/images/draglinkcursor_48.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/draglinkcursor_48.png"
-    )
-    set_source_files_properties("../windows/images/draglinkcursor_64.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/draglinkcursor_64.png"
-    )
-    set_source_files_properties("../windows/images/dragmovecursor_32.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/dragmovecursor_32.png"
-    )
-    set_source_files_properties("../windows/images/dragmovecursor_48.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/dragmovecursor_48.png"
-    )
-    set_source_files_properties("../windows/images/dragmovecursor_64.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/dragmovecursor_64.png"
-    )
-    set_source_files_properties("../windows/images/openhandcursor_32.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/openhandcursor_32.png"
-    )
-    set_source_files_properties("../windows/images/openhandcursor_48.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/openhandcursor_48.png"
-    )
-    set_source_files_properties("../windows/images/openhandcursor_64.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/openhandcursor_64.png"
-    )
-    set_source_files_properties("../windows/images/splithcursor_32.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/splithcursor_32.png"
-    )
-    set_source_files_properties("../windows/images/splithcursor_48.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/splithcursor_48.png"
-    )
-    set_source_files_properties("../windows/images/splithcursor_64.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/splithcursor_64.png"
-    )
-    set_source_files_properties("../windows/images/splitvcursor_32.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/splitvcursor_32.png"
-    )
-    set_source_files_properties("../windows/images/splitvcursor_48.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/splitvcursor_48.png"
-    )
-    set_source_files_properties("../windows/images/splitvcursor_64.png"
-        PROPERTIES QT_RESOURCE_ALIAS "images/splitvcursor_64.png"
-    )
     set(cursors_resource_files
-        "images/closedhandcursor_32.png"
-        "images/closedhandcursor_48.png"
-        "images/closedhandcursor_64.png"
-        "images/dragcopycursor_32.png"
-        "images/dragcopycursor_48.png"
-        "images/dragcopycursor_64.png"
-        "images/draglinkcursor_32.png"
-        "images/draglinkcursor_48.png"
-        "images/draglinkcursor_64.png"
-        "images/dragmovecursor_32.png"
-        "images/dragmovecursor_48.png"
-        "images/dragmovecursor_64.png"
-        "images/openhandcursor_32.png"
-        "images/openhandcursor_48.png"
-        "images/openhandcursor_64.png"
-        "images/splithcursor_32.png"
-        "images/splithcursor_48.png"
-        "images/splithcursor_64.png"
-        "images/splitvcursor_32.png"
-        "images/splitvcursor_48.png"
-        "images/splitvcursor_64.png"
+        "../windows/images/closedhandcursor_32.png"
+        "../windows/images/closedhandcursor_48.png"
+        "../windows/images/closedhandcursor_64.png"
+        "../windows/images/dragcopycursor_32.png"
+        "../windows/images/dragcopycursor_48.png"
+        "../windows/images/dragcopycursor_64.png"
+        "../windows/images/draglinkcursor_32.png"
+        "../windows/images/draglinkcursor_48.png"
+        "../windows/images/draglinkcursor_64.png"
+        "../windows/images/dragmovecursor_32.png"
+        "../windows/images/dragmovecursor_48.png"
+        "../windows/images/dragmovecursor_64.png"
+        "../windows/images/openhandcursor_32.png"
+        "../windows/images/openhandcursor_48.png"
+        "../windows/images/openhandcursor_64.png"
+        "../windows/images/splithcursor_32.png"
+        "../windows/images/splithcursor_48.png"
+        "../windows/images/splithcursor_64.png"
+        "../windows/images/splitvcursor_32.png"
+        "../windows/images/splitvcursor_48.png"
+        "../windows/images/splitvcursor_64.png"
     )
 
     qt_internal_add_resource(QWindowsDirect2DIntegrationPlugin "cursors"
diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt
index 1967f3d29a..2185c64b4b 100644
--- a/src/printsupport/CMakeLists.txt
+++ b/src/printsupport/CMakeLists.txt
@@ -103,36 +103,36 @@ qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog
 if(QT_FEATURE_printdialog)
     # Resources:
     set(qprintdialog_resource_files
-        "images/fit-page-24.png"
-        "images/fit-page-32.png"
-        "images/fit-width-24.png"
-        "images/fit-width-32.png"
-        "images/go-first-24.png"
-        "images/go-first-32.png"
-        "images/go-last-24.png"
-        "images/go-last-32.png"
-        "images/go-next-24.png"
-        "images/go-next-32.png"
-        "images/go-previous-24.png"
-        "images/go-previous-32.png"
-        "images/layout-landscape-24.png"
-        "images/layout-landscape-32.png"
-        "images/layout-portrait-24.png"
-        "images/layout-portrait-32.png"
-        "images/page-setup-24.png"
-        "images/page-setup-32.png"
-        "images/print-24.png"
-        "images/print-32.png"
-        "images/view-page-multi-24.png"
-        "images/view-page-multi-32.png"
-        "images/view-page-one-24.png"
-        "images/view-page-one-32.png"
-        "images/view-page-sided-24.png"
-        "images/view-page-sided-32.png"
-        "images/zoom-in-24.png"
-        "images/zoom-in-32.png"
-        "images/zoom-out-24.png"
-        "images/zoom-out-32.png"
+        "dialogs/images/fit-page-24.png"
+        "dialogs/images/fit-page-32.png"
+        "dialogs/images/fit-width-24.png"
+        "dialogs/images/fit-width-32.png"
+        "dialogs/images/go-first-24.png"
+        "dialogs/images/go-first-32.png"
+        "dialogs/images/go-last-24.png"
+        "dialogs/images/go-last-32.png"
+        "dialogs/images/go-next-24.png"
+        "dialogs/images/go-next-32.png"
+        "dialogs/images/go-previous-24.png"
+        "dialogs/images/go-previous-32.png"
+        "dialogs/images/layout-landscape-24.png"
+        "dialogs/images/layout-landscape-32.png"
+        "dialogs/images/layout-portrait-24.png"
+        "dialogs/images/layout-portrait-32.png"
+        "dialogs/images/page-setup-24.png"
+        "dialogs/images/page-setup-32.png"
+        "dialogs/images/print-24.png"
+        "dialogs/images/print-32.png"
+        "dialogs/images/view-page-multi-24.png"
+        "dialogs/images/view-page-multi-32.png"
+        "dialogs/images/view-page-one-24.png"
+        "dialogs/images/view-page-one-32.png"
+        "dialogs/images/view-page-sided-24.png"
+        "dialogs/images/view-page-sided-32.png"
+        "dialogs/images/zoom-in-24.png"
+        "dialogs/images/zoom-in-32.png"
+        "dialogs/images/zoom-out-24.png"
+        "dialogs/images/zoom-out-32.png"
     )
 
     qt_internal_add_resource(PrintSupport "qprintdialog"
@@ -144,8 +144,8 @@ if(QT_FEATURE_printdialog)
             ${qprintdialog_resource_files}
     )
     set(qprintdialog1_resource_files
-        "images/status-color.png"
-        "images/status-gray-scale.png"
+        "dialogs/images/status-color.png"
+        "dialogs/images/status-gray-scale.png"
     )
 
     qt_internal_add_resource(PrintSupport "qprintdialog1"
@@ -192,4 +192,3 @@ qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewdialog
 qt_internal_add_docs(PrintSupport
     doc/qtprintsupport.qdocconf
 )
-
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 34c8d2bc1e..683b3e742e 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -70,173 +70,173 @@ add_dependencies(Widgets ${QT_CMAKE_EXPORT_NAMESPACE}::uic)  # special case
 
 # Resources:
 set(qstyle_resource_files
-    "images/cdr-128.png"
-    "images/cdr-16.png"
-    "images/cdr-32.png"
-    "images/cleartext-16.png"
-    "images/cleartext-32.png"
-    "images/closedock-10.png"
-    "images/closedock-16.png"
-    "images/closedock-20.png"
-    "images/closedock-32.png"
-    "images/closedock-48.png"
-    "images/closedock-64.png"
-    "images/computer-16.png"
-    "images/computer-32.png"
-    "images/desktop-16.png"
-    "images/desktop-32.png"
-    "images/dirclosed-128.png"
-    "images/dirclosed-16.png"
-    "images/dirclosed-32.png"
-    "images/dirlink-128.png"
-    "images/dirlink-16.png"
-    "images/dirlink-32.png"
-    "images/diropen-128.png"
-    "images/diropen-16.png"
-    "images/diropen-32.png"
-    "images/down-128.png"
-    "images/down-16.png"
-    "images/down-32.png"
-    "images/dvd-128.png"
-    "images/dvd-16.png"
-    "images/dvd-32.png"
-    "images/file-128.png"
-    "images/file-16.png"
-    "images/file-32.png"
-    "images/filecontents-128.png"
-    "images/filecontents-16.png"
-    "images/filecontents-32.png"
-    "images/fileinfo-128.png"
-    "images/fileinfo-16.png"
-    "images/fileinfo-32.png"
-    "images/filelink-128.png"
-    "images/filelink-16.png"
-    "images/filelink-32.png"
-    "images/floppy-128.png"
-    "images/floppy-16.png"
-    "images/floppy-32.png"
-    "images/fontbitmap-16.png"
-    "images/fonttruetype-16.png"
-    "images/fusion_groupbox.png"
-    "images/harddrive-128.png"
-    "images/harddrive-16.png"
-    "images/harddrive-32.png"
-    "images/left-128.png"
-    "images/left-16.png"
-    "images/left-32.png"
-    "images/media-pause-16.png"
-    "images/media-pause-32.png"
-    "images/media-play-16.png"
-    "images/media-play-32.png"
-    "images/media-seek-backward-16.png"
-    "images/media-seek-backward-32.png"
-    "images/media-seek-forward-16.png"
-    "images/media-seek-forward-32.png"
-    "images/media-skip-backward-16.png"
-    "images/media-skip-backward-32.png"
-    "images/media-skip-forward-16.png"
-    "images/media-skip-forward-32.png"
-    "images/media-stop-16.png"
-    "images/media-stop-32.png"
-    "images/media-volume-16.png"
-    "images/media-volume-muted-16.png"
-    "images/networkdrive-128.png"
-    "images/networkdrive-16.png"
-    "images/networkdrive-32.png"
-    "images/newdirectory-128.png"
-    "images/newdirectory-16.png"
-    "images/newdirectory-32.png"
-    "images/normalizedockup-10.png"
-    "images/normalizedockup-16.png"
-    "images/normalizedockup-20.png"
-    "images/normalizedockup-32.png"
-    "images/normalizedockup-48.png"
-    "images/normalizedockup-64.png"
-    "images/parentdir-128.png"
-    "images/parentdir-16.png"
-    "images/parentdir-32.png"
-    "images/refresh-24.png"
-    "images/refresh-32.png"
-    "images/right-128.png"
-    "images/right-16.png"
-    "images/right-32.png"
-    "images/standardbutton-apply-128.png"
-    "images/standardbutton-apply-16.png"
-    "images/standardbutton-apply-32.png"
-    "images/standardbutton-cancel-128.png"
-    "images/standardbutton-cancel-16.png"
-    "images/standardbutton-cancel-32.png"
-    "images/standardbutton-clear-128.png"
-    "images/standardbutton-clear-16.png"
-    "images/standardbutton-clear-32.png"
-    "images/standardbutton-close-128.png"
-    "images/standardbutton-close-16.png"
-    "images/standardbutton-close-32.png"
-    "images/standardbutton-closetab-32.png"
-    "images/standardbutton-closetab-16.png"
-    "images/standardbutton-closetab-down-32.png"
-    "images/standardbutton-closetab-down-16.png"
-    "images/standardbutton-closetab-hover-32.png"
-    "images/standardbutton-closetab-hover-16.png"
-    "images/standardbutton-delete-128.png"
-    "images/standardbutton-delete-16.png"
-    "images/standardbutton-delete-32.png"
-    "images/standardbutton-help-128.png"
-    "images/standardbutton-help-16.png"
-    "images/standardbutton-help-32.png"
-    "images/standardbutton-no-128.png"
-    "images/standardbutton-no-16.png"
-    "images/standardbutton-no-32.png"
-    "images/standardbutton-ok-128.png"
-    "images/standardbutton-ok-16.png"
-    "images/standardbutton-ok-32.png"
-    "images/standardbutton-open-128.png"
-    "images/standardbutton-open-16.png"
-    "images/standardbutton-open-32.png"
-    "images/standardbutton-save-128.png"
-    "images/standardbutton-save-16.png"
-    "images/standardbutton-save-32.png"
-    "images/standardbutton-yes-128.png"
-    "images/standardbutton-yes-16.png"
-    "images/standardbutton-yes-32.png"
-    "images/stop-24.png"
-    "images/stop-32.png"
-    "images/titlebar-contexthelp-16.png"
-    "images/titlebar-contexthelp-32.png"
-    "images/titlebar-contexthelp-48.png"
-    "images/titlebar-max-16.png"
-    "images/titlebar-max-32.png"
-    "images/titlebar-max-48.png"
-    "images/titlebar-min-16.png"
-    "images/titlebar-min-32.png"
-    "images/titlebar-min-48.png"
-    "images/titlebar-shade-16.png"
-    "images/titlebar-shade-32.png"
-    "images/titlebar-shade-48.png"
-    "images/titlebar-unshade-16.png"
-    "images/titlebar-unshade-32.png"
-    "images/titlebar-unshade-48.png"
-    "images/toolbar-ext-h-16.png"
-    "images/toolbar-ext-h-32.png"
-    "images/toolbar-ext-h-8.png"
-    "images/toolbar-ext-h-rtl-16.png"
-    "images/toolbar-ext-h-rtl-32.png"
-    "images/toolbar-ext-h-rtl-8.png"
-    "images/toolbar-ext-v-10.png"
-    "images/toolbar-ext-v-20.png"
-    "images/toolbar-ext-v-5.png"
-    "images/trash-128.png"
-    "images/trash-16.png"
-    "images/trash-32.png"
-    "images/up-128.png"
-    "images/up-16.png"
-    "images/up-32.png"
-    "images/viewdetailed-128.png"
-    "images/viewdetailed-16.png"
-    "images/viewdetailed-32.png"
-    "images/viewlist-128.png"
-    "images/viewlist-16.png"
-    "images/viewlist-32.png"
+    "styles/images/cdr-128.png"
+    "styles/images/cdr-16.png"
+    "styles/images/cdr-32.png"
+    "styles/images/cleartext-16.png"
+    "styles/images/cleartext-32.png"
+    "styles/images/closedock-10.png"
+    "styles/images/closedock-16.png"
+    "styles/images/closedock-20.png"
+    "styles/images/closedock-32.png"
+    "styles/images/closedock-48.png"
+    "styles/images/closedock-64.png"
+    "styles/images/computer-16.png"
+    "styles/images/computer-32.png"
+    "styles/images/desktop-16.png"
+    "styles/images/desktop-32.png"
+    "styles/images/dirclosed-128.png"
+    "styles/images/dirclosed-16.png"
+    "styles/images/dirclosed-32.png"
+    "styles/images/dirlink-128.png"
+    "styles/images/dirlink-16.png"
+    "styles/images/dirlink-32.png"
+    "styles/images/diropen-128.png"
+    "styles/images/diropen-16.png"
+    "styles/images/diropen-32.png"
+    "styles/images/down-128.png"
+    "styles/images/down-16.png"
+    "styles/images/down-32.png"
+    "styles/images/dvd-128.png"
+    "styles/images/dvd-16.png"
+    "styles/images/dvd-32.png"
+    "styles/images/file-128.png"
+    "styles/images/file-16.png"
+    "styles/images/file-32.png"
+    "styles/images/filecontents-128.png"
+    "styles/images/filecontents-16.png"
+    "styles/images/filecontents-32.png"
+    "styles/images/fileinfo-128.png"
+    "styles/images/fileinfo-16.png"
+    "styles/images/fileinfo-32.png"
+    "styles/images/filelink-128.png"
+    "styles/images/filelink-16.png"
+    "styles/images/filelink-32.png"
+    "styles/images/floppy-128.png"
+    "styles/images/floppy-16.png"
+    "styles/images/floppy-32.png"
+    "styles/images/fontbitmap-16.png"
+    "styles/images/fonttruetype-16.png"
+    "styles/images/fusion_groupbox.png"
+    "styles/images/harddrive-128.png"
+    "styles/images/harddrive-16.png"
+    "styles/images/harddrive-32.png"
+    "styles/images/left-128.png"
+    "styles/images/left-16.png"
+    "styles/images/left-32.png"
+    "styles/images/media-pause-16.png"
+    "styles/images/media-pause-32.png"
+    "styles/images/media-play-16.png"
+    "styles/images/media-play-32.png"
+    "styles/images/media-seek-backward-16.png"
+    "styles/images/media-seek-backward-32.png"
+    "styles/images/media-seek-forward-16.png"
+    "styles/images/media-seek-forward-32.png"
+    "styles/images/media-skip-backward-16.png"
+    "styles/images/media-skip-backward-32.png"
+    "styles/images/media-skip-forward-16.png"
+    "styles/images/media-skip-forward-32.png"
+    "styles/images/media-stop-16.png"
+    "styles/images/media-stop-32.png"
+    "styles/images/media-volume-16.png"
+    "styles/images/media-volume-muted-16.png"
+    "styles/images/networkdrive-128.png"
+    "styles/images/networkdrive-16.png"
+    "styles/images/networkdrive-32.png"
+    "styles/images/newdirectory-128.png"
+    "styles/images/newdirectory-16.png"
+    "styles/images/newdirectory-32.png"
+    "styles/images/normalizedockup-10.png"
+    "styles/images/normalizedockup-16.png"
+    "styles/images/normalizedockup-20.png"
+    "styles/images/normalizedockup-32.png"
+    "styles/images/normalizedockup-48.png"
+    "styles/images/normalizedockup-64.png"
+    "styles/images/parentdir-128.png"
+    "styles/images/parentdir-16.png"
+    "styles/images/parentdir-32.png"
+    "styles/images/refresh-24.png"
+    "styles/images/refresh-32.png"
+    "styles/images/right-128.png"
+    "styles/images/right-16.png"
+    "styles/images/right-32.png"
+    "styles/images/standardbutton-apply-128.png"
+    "styles/images/standardbutton-apply-16.png"
+    "styles/images/standardbutton-apply-32.png"
+    "styles/images/standardbutton-cancel-128.png"
+    "styles/images/standardbutton-cancel-16.png"
+    "styles/images/standardbutton-cancel-32.png"
+    "styles/images/standardbutton-clear-128.png"
+    "styles/images/standardbutton-clear-16.png"
+    "styles/images/standardbutton-clear-32.png"
+    "styles/images/standardbutton-close-128.png"
+    "styles/images/standardbutton-close-16.png"
+    "styles/images/standardbutton-close-32.png"
+    "styles/images/standardbutton-closetab-32.png"
+    "styles/images/standardbutton-closetab-16.png"
+    "styles/images/standardbutton-closetab-down-32.png"
+    "styles/images/standardbutton-closetab-down-16.png"
+    "styles/images/standardbutton-closetab-hover-32.png"
+    "styles/images/standardbutton-closetab-hover-16.png"
+    "styles/images/standardbutton-delete-128.png"
+    "styles/images/standardbutton-delete-16.png"
+    "styles/images/standardbutton-delete-32.png"
+    "styles/images/standardbutton-help-128.png"
+    "styles/images/standardbutton-help-16.png"
+    "styles/images/standardbutton-help-32.png"
+    "styles/images/standardbutton-no-128.png"
+    "styles/images/standardbutton-no-16.png"
+    "styles/images/standardbutton-no-32.png"
+    "styles/images/standardbutton-ok-128.png"
+    "styles/images/standardbutton-ok-16.png"
+    "styles/images/standardbutton-ok-32.png"
+    "styles/images/standardbutton-open-128.png"
+    "styles/images/standardbutton-open-16.png"
+    "styles/images/standardbutton-open-32.png"
+    "styles/images/standardbutton-save-128.png"
+    "styles/images/standardbutton-save-16.png"
+    "styles/images/standardbutton-save-32.png"
+    "styles/images/standardbutton-yes-128.png"
+    "styles/images/standardbutton-yes-16.png"
+    "styles/images/standardbutton-yes-32.png"
+    "styles/images/stop-24.png"
+    "styles/images/stop-32.png"
+    "styles/images/titlebar-contexthelp-16.png"
+    "styles/images/titlebar-contexthelp-32.png"
+    "styles/images/titlebar-contexthelp-48.png"
+    "styles/images/titlebar-max-16.png"
+    "styles/images/titlebar-max-32.png"
+    "styles/images/titlebar-max-48.png"
+    "styles/images/titlebar-min-16.png"
+    "styles/images/titlebar-min-32.png"
+    "styles/images/titlebar-min-48.png"
+    "styles/images/titlebar-shade-16.png"
+    "styles/images/titlebar-shade-32.png"
+    "styles/images/titlebar-shade-48.png"
+    "styles/images/titlebar-unshade-16.png"
+    "styles/images/titlebar-unshade-32.png"
+    "styles/images/titlebar-unshade-48.png"
+    "styles/images/toolbar-ext-h-16.png"
+    "styles/images/toolbar-ext-h-32.png"
+    "styles/images/toolbar-ext-h-8.png"
+    "styles/images/toolbar-ext-h-rtl-16.png"
+    "styles/images/toolbar-ext-h-rtl-32.png"
+    "styles/images/toolbar-ext-h-rtl-8.png"
+    "styles/images/toolbar-ext-v-10.png"
+    "styles/images/toolbar-ext-v-20.png"
+    "styles/images/toolbar-ext-v-5.png"
+    "styles/images/trash-128.png"
+    "styles/images/trash-16.png"
+    "styles/images/trash-32.png"
+    "styles/images/up-128.png"
+    "styles/images/up-16.png"
+    "styles/images/up-32.png"
+    "styles/images/viewdetailed-128.png"
+    "styles/images/viewdetailed-16.png"
+    "styles/images/viewdetailed-32.png"
+    "styles/images/viewlist-128.png"
+    "styles/images/viewlist-16.png"
+    "styles/images/viewlist-32.png"
 )
 
 qt_internal_add_resource(Widgets "qstyle"
@@ -247,31 +247,13 @@ qt_internal_add_resource(Widgets "qstyle"
     FILES
         ${qstyle_resource_files}
 )
-set_source_files_properties("styles/images/closedock-down-macstyle-16.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/closedock-down-16.png"
-)
-set_source_files_properties("styles/images/closedock-macstyle-16.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/closedock-16.png"
-)
-set_source_files_properties("styles/images/dockdock-down-macstyle-16.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dockdock-down-16.png"
-)
-set_source_files_properties("styles/images/dockdock-macstyle-16.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dockdock-16.png"
-)
-set_source_files_properties("styles/images/toolbar-ext-macstyle.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/toolbar-ext.png"
-)
-set_source_files_properties("styles/images/toolbar-ext-macstyle@2x.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/toolbar-ext@2x.png"
-)
 set(qstyle1_resource_files
-    "images/closedock-down-macstyle-16.png"
-    "images/closedock-macstyle-16.png"
-    "images/dockdock-down-macstyle-16.png"
-    "images/dockdock-macstyle-16.png"
-    "images/toolbar-ext-macstyle.png"
-    "images/toolbar-ext-macstyle@2x.png"
+    "styles/images/closedock-down-macstyle-16.png"
+    "styles/images/closedock-macstyle-16.png"
+    "styles/images/dockdock-down-macstyle-16.png"
+    "styles/images/dockdock-macstyle-16.png"
+    "styles/images/toolbar-ext-macstyle.png"
+    "styles/images/toolbar-ext-macstyle@2x.png"
 )
 
 qt_internal_add_resource(Widgets "qstyle1"
@@ -654,7 +636,7 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_messagebox
 if(QT_FEATURE_messagebox)
     # Resources:
     set(qmessagebox_resource_files
-        "images/qtlogo-64.png"
+        "dialogs/images/qtlogo-64.png"
     )
 
     qt_internal_add_resource(Widgets "qmessagebox"
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt
index b9ce8209f7..2d7844493f 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt
@@ -23,47 +23,17 @@ qt_internal_add_test(tst_qmimedatabase-cache
     #"mime/packages/freedesktop.org.xml"
 #)
 # special case end
-set_source_files_properties("../invalid-magic1.xml"
-    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml"
-)
-set_source_files_properties("../invalid-magic2.xml"
-    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml"
-)
-set_source_files_properties("../invalid-magic3.xml"
-    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml"
-)
-set_source_files_properties("../magic-and-hierarchy.foo"
-    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo"
-)
-set_source_files_properties("../magic-and-hierarchy.xml"
-    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml"
-)
-set_source_files_properties("../magic-and-hierarchy2.foo"
-    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo"
-)
-set_source_files_properties("../qml-again.xml"
-    PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml"
-)
-set_source_files_properties("../test.qml"
-    PROPERTIES QT_RESOURCE_ALIAS "test.qml"
-)
-set_source_files_properties("../text-x-objcsrc.xml"
-    PROPERTIES QT_RESOURCE_ALIAS "text-x-objcsrc.xml"
-)
-set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml"
-    PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml"
-)
 set(testdata_resource_files
-    "invalid-magic1.xml"
-    "invalid-magic2.xml"
-    "invalid-magic3.xml"
-    "magic-and-hierarchy.foo"
-    "magic-and-hierarchy.xml"
-    "magic-and-hierarchy2.foo"
-    "qml-again.xml"
-    "test.qml"
-    "text-x-objcsrc.xml"
-    "yast2-metapackage-handler-mimetypes.xml"
+    "../invalid-magic1.xml"
+    "../invalid-magic2.xml"
+    "../invalid-magic3.xml"
+    "../magic-and-hierarchy.foo"
+    "../magic-and-hierarchy.xml"
+    "../magic-and-hierarchy2.foo"
+    "../qml-again.xml"
+    "../test.qml"
+    "../text-x-objcsrc.xml"
+    "../yast2-metapackage-handler-mimetypes.xml"
 )
 
 qt_internal_add_resource(tst_qmimedatabase-cache "testdata"
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt
index ddc5b99baa..47e9a2f1d7 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt
@@ -23,47 +23,17 @@ qt_internal_add_test(tst_qmimedatabase-xml
     #"mime/packages/freedesktop.org.xml"
 #)
 # special case end
-set_source_files_properties("../invalid-magic1.xml"
-    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml"
-)
-set_source_files_properties("../invalid-magic2.xml"
-    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml"
-)
-set_source_files_properties("../invalid-magic3.xml"
-    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml"
-)
-set_source_files_properties("../magic-and-hierarchy.foo"
-    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo"
-)
-set_source_files_properties("../magic-and-hierarchy.xml"
-    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml"
-)
-set_source_files_properties("../magic-and-hierarchy2.foo"
-    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo"
-)
-set_source_files_properties("../qml-again.xml"
-    PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml"
-)
-set_source_files_properties("../test.qml"
-    PROPERTIES QT_RESOURCE_ALIAS "test.qml"
-)
-set_source_files_properties("../text-x-objcsrc.xml"
-    PROPERTIES QT_RESOURCE_ALIAS "text-x-objcsrc.xml"
-)
-set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml"
-    PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml"
-)
 set(testdata_resource_files
-    "invalid-magic1.xml"
-    "invalid-magic2.xml"
-    "invalid-magic3.xml"
-    "magic-and-hierarchy.foo"
-    "magic-and-hierarchy.xml"
-    "magic-and-hierarchy2.foo"
-    "qml-again.xml"
-    "test.qml"
-    "text-x-objcsrc.xml"
-    "yast2-metapackage-handler-mimetypes.xml"
+    "../invalid-magic1.xml"
+    "../invalid-magic2.xml"
+    "../invalid-magic3.xml"
+    "../magic-and-hierarchy.foo"
+    "../magic-and-hierarchy.xml"
+    "../magic-and-hierarchy2.foo"
+    "../qml-again.xml"
+    "../test.qml"
+    "../text-x-objcsrc.xml"
+    "../yast2-metapackage-handler-mimetypes.xml"
 )
 
 qt_internal_add_resource(tst_qmimedatabase-xml "testdata"
diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
index 8515af2beb..675dbbd684 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
@@ -55,6 +55,7 @@ if(ANDROID)
             bin/libplugin2.so
         )
     endif()
+    list(TRANSFORM qmake_libs_resource_files PREPEND "${CMAKE_CURRENT_BINARY_DIR}/../")
     # special case end
 
     qt_internal_add_resource(tst_qfactoryloader "qmake_libs"
diff --git a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt
index ef062a53a2..73c05aeebe 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt
+++ b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt
@@ -40,6 +40,8 @@ if(ANDROID)
         # special case end
     )
 
+    list(TRANSFORM qmake_libs_resource_files PREPEND "${CMAKE_CURRENT_BINARY_DIR}/../")
+
     qt_internal_add_resource(tst_qlibrary "qmake_libs"
         PREFIX
             "android_test_data"
diff --git a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
index c90a6f12c5..2dccf09ac4 100644
--- a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
@@ -23,15 +23,9 @@ qt_internal_add_test(tst_qtextstream
 )
 
 # Resources:
-set_source_files_properties("../resources/big_endian/"
-    PROPERTIES QT_RESOURCE_ALIAS "resources/big_endian/"
-)
-set_source_files_properties("../resources/little_endian/"
-    PROPERTIES QT_RESOURCE_ALIAS "resources/little_endian/"
-)
 set(qtextstream_resource_files
-    "resources/big_endian/"
-    "resources/little_endian/"
+    "../resources/big_endian/"
+    "../resources/little_endian/"
 )
 
 qt_internal_add_resource(tst_qtextstream "qtextstream"
diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
index d1b664e2d6..17ce3c5c16 100644
--- a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
@@ -29,11 +29,8 @@ qt_internal_add_test(tst_qnetworkreply
 )
 
 # Resources:
-set_source_files_properties("../resource"
-    PROPERTIES QT_RESOURCE_ALIAS "resource"
-)
 set(qnetworkreply_resource_files
-    "resource"
+    "../resource"
 )
 
 qt_internal_add_resource(tst_qnetworkreply "qnetworkreply"
diff --git a/tests/auto/tools/rcc/CMakeLists.txt b/tests/auto/tools/rcc/CMakeLists.txt
index 40b91baa3a..abcf3a1f60 100644
--- a/tests/auto/tools/rcc/CMakeLists.txt
+++ b/tests/auto/tools/rcc/CMakeLists.txt
@@ -11,9 +11,9 @@ qt_internal_add_test(tst_rcc
 
 # Resources:
 set(images_resource_files
-    "images/circle.png"
-    "images/square.png"
-    "images/subdir/triangle.png"
+    "data/images/images/circle.png"
+    "data/images/images/square.png"
+    "data/images/images/subdir/triangle.png"
 )
 
 qt_internal_add_resource(tst_rcc "images"
@@ -25,7 +25,7 @@ qt_internal_add_resource(tst_rcc "images"
         ${images_resource_files}
 )
 set(size-0_resource_files
-    "data/data-0.txt"
+    "data/sizes/data/data-0.txt"
 )
 
 qt_internal_add_resource(tst_rcc "size-0"
@@ -37,10 +37,10 @@ qt_internal_add_resource(tst_rcc "size-0"
         ${size-0_resource_files}
 )
 set(size-2-0-35-1_resource_files
-    "data/data-0.txt"
-    "data/data-1.txt"
-    "data/data-2.txt"
-    "data/data-35.txt"
+    "data/sizes/data/data-0.txt"
+    "data/sizes/data/data-1.txt"
+    "data/sizes/data/data-2.txt"
+    "data/sizes/data/data-35.txt"
 )
 
 qt_internal_add_resource(tst_rcc "size-2-0-35-1"
@@ -52,7 +52,7 @@ qt_internal_add_resource(tst_rcc "size-2-0-35-1"
         ${size-2-0-35-1_resource_files}
 )
 set(size-1_resource_files
-    "data/data-1.txt"
+    "data/sizes/data/data-1.txt"
 )
 
 qt_internal_add_resource(tst_rcc "size-1"
@@ -63,4 +63,3 @@ qt_internal_add_resource(tst_rcc "size-1"
     FILES
         ${size-1_resource_files}
 )
-
diff --git a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt
index 2807332cca..e278f0ddc0 100644
--- a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt
+++ b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt
@@ -15,93 +15,6 @@ qt_internal_add_benchmark(tst_bench_lancebench
 )
 
 # Resources:
-set_source_files_properties("../../../../auto/other/lancelot/images/alpha.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/alpha.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/alpha2x2.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/alpha2x2.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/bitmap.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/bitmap.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/border.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/border.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/borderimage.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/borderimage.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/dome_argb32.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dome_argb32.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/dome_indexed.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/dome_indexed_mask.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed_mask.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/dome_mono.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/dome_mono_128.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_128.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/dome_mono_palette.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_palette.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/dome_rgb32.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dome_rgb32.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dot.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/face.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/face.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/gam030.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/gam030.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/gam045.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/gam045.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/gam056.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/gam056.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/gam100.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/gam100.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/gam200.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/gam200.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/image.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/image.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/mask.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/mask.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/mask_100.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/mask_100.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/masked.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/masked.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/sign.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/sign.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/solid.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/solid.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/solid2x2.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/solid2x2.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/struct-image-01.jpg"
-    PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.jpg"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/struct-image-01.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.png"
-)
-set_source_files_properties("../../../../auto/other/lancelot/images/zebra.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/zebra.png"
-)
 set(images_resource_files
     "images/alpha.png"
     "images/alpha2x2.png"
@@ -134,6 +47,8 @@ set(images_resource_files
     "images/zebra.png"
 )
 
+list(TRANSFORM images_resource_files PREPEND "../../../../auto/other/lancelot/")
+
 qt_internal_add_resource(tst_bench_lancebench "images"
     PREFIX
         "/"
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt
index 178e5dc125..60509247e3 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt
@@ -30,7 +30,7 @@ qt_internal_add_resource(tst_bench_qgraphicsview "qgraphicsview"
         ${qgraphicsview_resource_files}
 )
 set(images_resource_files
-    "qt4logo.png"
+    "chiptester/qt4logo.png"
 )
 
 qt_internal_add_resource(tst_bench_qgraphicsview "images"
diff --git a/tests/manual/lance/CMakeLists.txt b/tests/manual/lance/CMakeLists.txt
index 568aeaa6e7..02b7273be4 100644
--- a/tests/manual/lance/CMakeLists.txt
+++ b/tests/manual/lance/CMakeLists.txt
@@ -34,125 +34,37 @@ qt_internal_add_resource(lance "icons"
     FILES
         ${icons_resource_files}
 )
-set_source_files_properties("../../auto/other/lancelot/images/alpha.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/alpha.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/alpha2x2.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/alpha2x2.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/bitmap.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/bitmap.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/border.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/border.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/borderimage.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/borderimage.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/dome_argb32.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dome_argb32.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/dome_indexed.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/dome_indexed_mask.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed_mask.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/dome_mono.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/dome_mono_128.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_128.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/dome_mono_palette.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_palette.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/dome_rgb32.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dome_rgb32.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/dot.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/dot.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/face.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/face.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/gam030.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/gam030.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/gam045.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/gam045.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/gam056.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/gam056.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/gam100.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/gam100.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/gam200.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/gam200.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/image.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/image.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/mask.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/mask.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/mask_100.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/mask_100.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/masked.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/masked.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/sign.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/sign.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/solid.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/solid.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/solid2x2.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/solid2x2.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/struct-image-01.jpg"
-    PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.jpg"
-)
-set_source_files_properties("../../auto/other/lancelot/images/struct-image-01.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.png"
-)
-set_source_files_properties("../../auto/other/lancelot/images/zebra.png"
-    PROPERTIES QT_RESOURCE_ALIAS "images/zebra.png"
-)
 set(images_resource_files
-    "images/alpha.png"
-    "images/alpha2x2.png"
-    "images/bitmap.png"
-    "images/border.png"
-    "images/borderimage.png"
-    "images/dome_argb32.png"
-    "images/dome_indexed.png"
-    "images/dome_indexed_mask.png"
-    "images/dome_mono.png"
-    "images/dome_mono_128.png"
-    "images/dome_mono_palette.png"
-    "images/dome_rgb32.png"
-    "images/dot.png"
-    "images/face.png"
-    "images/gam030.png"
-    "images/gam045.png"
-    "images/gam056.png"
-    "images/gam100.png"
-    "images/gam200.png"
-    "images/image.png"
-    "images/mask.png"
-    "images/mask_100.png"
-    "images/masked.png"
-    "images/sign.png"
-    "images/solid.png"
-    "images/solid2x2.png"
-    "images/struct-image-01.jpg"
-    "images/struct-image-01.png"
-    "images/zebra.png"
+    "../../auto/other/lancelot/images/alpha.png"
+    "../../auto/other/lancelot/images/alpha2x2.png"
+    "../../auto/other/lancelot/images/bitmap.png"
+    "../../auto/other/lancelot/images/border.png"
+    "../../auto/other/lancelot/images/borderimage.png"
+    "../../auto/other/lancelot/images/dome_argb32.png"
+    "../../auto/other/lancelot/images/dome_indexed.png"
+    "../../auto/other/lancelot/images/dome_indexed_mask.png"
+    "../../auto/other/lancelot/images/dome_mono.png"
+    "../../auto/other/lancelot/images/dome_mono_128.png"
+    "../../auto/other/lancelot/images/dome_mono_palette.png"
+    "../../auto/other/lancelot/images/dome_rgb32.png"
+    "../../auto/other/lancelot/images/dot.png"
+    "../../auto/other/lancelot/images/face.png"
+    "../../auto/other/lancelot/images/gam030.png"
+    "../../auto/other/lancelot/images/gam045.png"
+    "../../auto/other/lancelot/images/gam056.png"
+    "../../auto/other/lancelot/images/gam100.png"
+    "../../auto/other/lancelot/images/gam200.png"
+    "../../auto/other/lancelot/images/image.png"
+    "../../auto/other/lancelot/images/mask.png"
+    "../../auto/other/lancelot/images/mask_100.png"
+    "../../auto/other/lancelot/images/masked.png"
+    "../../auto/other/lancelot/images/sign.png"
+    "../../auto/other/lancelot/images/solid.png"
+    "../../auto/other/lancelot/images/solid2x2.png"
+    "../../auto/other/lancelot/images/struct-image-01.jpg"
+    "../../auto/other/lancelot/images/struct-image-01.png"
+    "../../auto/other/lancelot/images/zebra.png"
 )
-
 qt_internal_add_resource(lance "images"
     PREFIX
         "/"
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index e6943727a4..413f1f44bc 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -482,11 +482,6 @@ def process_qrc_file(
 
             # Get alias:
             alias = file.get("alias", "")
-            # In cases where examples use shared resources, we set the alias
-            # too the same name of the file, or the applications won't be
-            # be able to locate the resource
-            if not alias and is_parent_path:
-                alias = path
             files[path] = alias
 
         output += write_add_qt_resource_call(
@@ -518,26 +513,29 @@ def write_add_qt_resource_call(
 ) -> str:
     output = ""
 
-    sorted_files = sorted(files.keys())
-
-    assert sorted_files
-
     if base_dir:
         base_dir_expanded = scope.expandString(base_dir)
         if base_dir_expanded:
             base_dir = base_dir_expanded
+        new_files = {}
+        for file_path, alias in files.items():
+            full_file_path = posixpath.join(base_dir, file_path)
+            new_files[full_file_path] = alias
+        files = new_files
+
+    sorted_files = sorted(files.keys())
+    assert sorted_files
 
     source_file_properties = defaultdict(list)
 
     for source in sorted_files:
-        full_source = posixpath.join(base_dir, source)
         alias = files[source]
         if alias:
-            source_file_properties[full_source].append(f'QT_RESOURCE_ALIAS "{alias}"')
+            source_file_properties[source].append(f'QT_RESOURCE_ALIAS "{alias}"')
         # If a base dir is given, we have to write the source file property
         # assignments that disable the quick compiler per file.
         if base_dir and skip_qtquick_compiler:
-            source_file_properties[full_source].append("QT_SKIP_QUICKCOMPILER 1")
+            source_file_properties[source].append("QT_SKIP_QUICKCOMPILER 1")
 
     for full_source in source_file_properties:
         per_file_props = source_file_properties[full_source]