AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup temporary code related to internal modules

Browse Source 
Remove the temprotary 'Private' targets of the iternal modules.

Pick-to: 6.2
Task-number: QTBUG-87775
Change-Id: I9a2c7c8c2f63602476fd935b11dab7a835864537
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2021-06-11 12:55:32 +02:00
parent 73ea9f0328
commit 991b64a7e5
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/QtModuleHelpers.cmake
View File

@ -205,13 +205,6 @@ function(qt_internal_add_module target)
_qt_config_module_name ${arg_CONFIG_MODULE_NAME}_private) _qt_config_module_name ${arg_CONFIG_MODULE_NAME}_private)
set_property(TARGET "${target_private}" APPEND PROPERTY set_property(TARGET "${target_private}" APPEND PROPERTY
EXPORT_PROPERTIES _qt_config_module_name) EXPORT_PROPERTIES _qt_config_module_name)
elseif(arg_INTERNAL_MODULE)
# TODO: We need to create temporary private targets for the internal modules to keep the
# existing code compatible to the internal modules that don't have the 'Private' suffix yet.
# Remove this once the migration is complete.
add_library("${target_private}" INTERFACE)
qt_internal_add_target_aliases("${target_private}")
target_link_libraries(${target_private} INTERFACE ${target})
endif() endif()
if(NOT arg_HEADER_MODULE) if(NOT arg_HEADER_MODULE)
@ -634,8 +627,7 @@ set(QT_LIBINFIX \"${QT_LIBINFIX}\")")
file(COPY ${extra_cmake_files} DESTINATION "${config_build_dir}") file(COPY ${extra_cmake_files} DESTINATION "${config_build_dir}")
set(exported_targets ${target}) set(exported_targets ${target})
#TODO: remove the 'OR arg_INTERNAL_MODULE' part once renaming of internal modules is finished. if(NOT ${arg_NO_PRIVATE_MODULE})
if(NOT ${arg_NO_PRIVATE_MODULE} OR arg_INTERNAL_MODULE)
list(APPEND exported_targets ${target_private}) list(APPEND exported_targets ${target_private})
endif() endif()
set(export_name "${INSTALL_CMAKE_NAMESPACE}${target}Targets") set(export_name "${INSTALL_CMAKE_NAMESPACE}${target}Targets")