From 92185d417de43237ae62eae55599c65922cd9a15 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 14 May 2021 15:31:30 +0200 Subject: 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 --- tests/auto/network/access/qnetworkreply/test/CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tests/auto/network/access') diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt index d1b664e2d6..17ce3c5c16 100644 --- a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt @@ -29,11 +29,8 @@ qt_internal_add_test(tst_qnetworkreply ) # Resources: -set_source_files_properties("../resource" - PROPERTIES QT_RESOURCE_ALIAS "resource" -) set(qnetworkreply_resource_files - "resource" + "../resource" ) qt_internal_add_resource(tst_qnetworkreply "qnetworkreply" -- cgit v1.2.3