1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove legacy code path from qt_add_resource

Browse Source 
All repos use the updated version of qt_add_resource, and we can remove
the legacy code path.

Change-Id: I15ba64a08c3fad9712a5cf05715594b1ee755bfc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2021-06-07 09:34:43 +02:00
parent d23613acf7
commit 33aa461ec9
2 changed files with 11 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -43,9 +43,6 @@ project(QtBase
LANGUAGES CXX C ASM LANGUAGES CXX C ASM
) )
# Make sure we use the fixed BASE argument of qt_add_resource.
set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE)
if(NOT QT_BUILD_STANDALONE_TESTS) if(NOT QT_BUILD_STANDALONE_TESTS)
## Add some paths to check for cmake modules: ## Add some paths to check for cmake modules:
list(PREPEND CMAKE_MODULE_PATH list(PREPEND CMAKE_MODULE_PATH

48
src/corelib/Qt6CoreMacros.cmake
View File

@ -1541,43 +1541,17 @@ function(_qt_internal_process_resource target resourceName)
string(REPLACE "." "_" resourceName ${resourceName}) string(REPLACE "." "_" resourceName ${resourceName})
set(output_targets "") set(output_targets "")
if(NOT DEFINED QT_REPO_MODULE_VERSION OR QT_USE_FIXED_QT_ADD_RESOURCE_BASE) set(resource_files ${rcc_FILES})
# Use the fixed BASE argument instead of the slightly broken one from 6.0. if(NOT "${rcc_BASE}" STREQUAL "")
set(resource_files ${rcc_FILES}) get_filename_component(abs_base "${rcc_BASE}" ABSOLUTE)
if(NOT "${rcc_BASE}" STREQUAL "") foreach(file_path IN LISTS resource_files)
get_filename_component(abs_base "${rcc_BASE}" ABSOLUTE) get_source_file_property(alias "${file_path}" QT_RESOURCE_ALIAS)
foreach(file_path IN LISTS resource_files) if(alias STREQUAL "NOTFOUND")
get_source_file_property(alias "${file_path}" QT_RESOURCE_ALIAS) get_filename_component(abs_file "${file_path}" ABSOLUTE)
if(alias STREQUAL "NOTFOUND") file(RELATIVE_PATH rel_file "${abs_base}" "${abs_file}")
get_filename_component(abs_file "${file_path}" ABSOLUTE) set_property(SOURCE "${file_path}" PROPERTY QT_RESOURCE_ALIAS "${rel_file}")
file(RELATIVE_PATH rel_file "${abs_base}" "${abs_file}") endif()
set_property(SOURCE "${file_path}" PROPERTY QT_RESOURCE_ALIAS "${rel_file}") endforeach()
endif()
endforeach()
endif()
else()
# TODO: Remove this else branch, once every Qt module defines
# QT_USE_FIXED_QT_ADD_RESOURCE_BASE.
# Apply base to all files
if (rcc_BASE)
foreach(file_path IN LISTS rcc_FILES)
set(resource_file "${rcc_BASE}/${file_path}")
__qt_get_relative_resource_path_for_file(alias ${resource_file})
# Handle case where resources were generated from a directory
# different than the one where the main .pro file resides.
# Unless otherwise specified, we should use the original file path
# as alias.
if (alias STREQUAL resource_file)
set_source_files_properties(${resource_file} PROPERTIES
QT_RESOURCE_ALIAS ${file_path})
endif()
file(TO_CMAKE_PATH ${resource_file} resource_file)
list(APPEND resource_files ${resource_file})
endforeach()
else()
set(resource_files ${rcc_FILES})
endif()
endif() endif()
if(NOT rcc_PREFIX) if(NOT rcc_PREFIX)