diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-05-14 15:31:30 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-05-18 16:02:52 +0200 |
commit | 92185d417de43237ae62eae55599c65922cd9a15 (patch) | |
tree | 729e22c7932ed9556d959d57eb0c7ad9779fb450 /examples/widgets/painting/deform | |
parent | 18aad6da87a329ddf7ca7c92bf2371628220fb4f (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.
Pick-to: 6.1
Task-number: QTBUG-86726
Change-Id: Ib895edd4df8e97b54badadd9a1c34408beff131f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples/widgets/painting/deform')
-rw-r--r-- | examples/widgets/painting/deform/.prev_CMakeLists.txt | 175 | ||||
-rw-r--r-- | examples/widgets/painting/deform/CMakeLists.txt | 175 |
2 files changed, 70 insertions, 280 deletions
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 6b8a66d9a2..6ab43cc371 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" |