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.

Pick-to: 6.1
Task-number: QTBUG-86726
Change-Id: Ib895edd4df8e97b54badadd9a1c34408beff131f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 2 insertions, 87 deletions

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
         "/"