diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-05-14 15:31:30 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-18 19:11:38 +0000 |
commit | 78a192e58d208680f10d397b275a5b571b600749 (patch) | |
tree | 0faab14f106c2a0c45047f76a2e43ad95c8f5560 /tests/manual | |
parent | fb9d138e5369c0585cc658583a60539002057ec6 (diff) |
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>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/lance/CMakeLists.txt | 146 |
1 files changed, 29 insertions, 117 deletions
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 "/" |