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>

5 files changed, 267 insertions, 331 deletions

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"