diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-11 12:55:32 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-21 21:43:30 +0000 |
| commit | e4d082f65ca728e00dd0f03740a166c51f675ac3 (patch) | |
| tree | 1b2968c21feef6db763383a70eaa3e620a08bbee | |
| parent | 5240267e10775170574e76ae94cff0e27b2feefe (diff) | |
Cleanup temporary code related to internal modules
Remove the temprotary 'Private' targets of the iternal modules.
Task-number: QTBUG-87775
Change-Id: I9a2c7c8c2f63602476fd935b11dab7a835864537
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 991b64a7e5bd8c46750afe0b7f47aa848ef34ce0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 9a3cdd209b..d6e89cb2f2 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -205,13 +205,6 @@ function(qt_internal_add_module target) _qt_config_module_name ${arg_CONFIG_MODULE_NAME}_private) set_property(TARGET "${target_private}" APPEND PROPERTY 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() if(NOT arg_HEADER_MODULE) @@ -634,8 +627,7 @@ set(QT_LIBINFIX \"${QT_LIBINFIX}\")") file(COPY ${extra_cmake_files} DESTINATION "${config_build_dir}") 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} OR arg_INTERNAL_MODULE) + if(NOT ${arg_NO_PRIVATE_MODULE}) list(APPEND exported_targets ${target_private}) endif() set(export_name "${INSTALL_CMAKE_NAMESPACE}${target}Targets") |