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 /src/plugins | |
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 'src/plugins')
-rw-r--r-- | src/plugins/platforms/direct2d/CMakeLists.txt | 109 |
1 files changed, 22 insertions, 87 deletions
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" |