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

Use _qt_module_has_headers instead of INTERFACE_MODULE_HAS_HEADERS

Browse Source 
After introducing the _qt_module_has_headers target property, it's
better to replace the INTERFACE_MODULE_HAS_HEADERS use by
_qt_module_has_headers since properties duplicate each other.

Change-Id: I4d62ed71b8ed8263f51d8575628693122580b4a7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit f0bb95cb6330cdb3e1b749ed5b1c222bbe3050bc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2021-07-30 11:41:47 +02:00 committed by Qt Cherry-pick Bot
parent d5ad37b094
commit 8910951a45
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtModuleHelpers.cmake
View File

@ -274,7 +274,6 @@ function(qt_internal_add_module target)
set_property(TARGET "${target}" APPEND PROPERTY EXPORT_PROPERTIES _qt_module_has_headers)
if(${arg_NO_MODULE_HEADERS} OR ${arg_NO_SYNC_QT})
set_target_properties("${target}" PROPERTIES
INTERFACE_MODULE_HAS_HEADERS OFF
_qt_module_has_headers OFF)
else()
set_target_properties("${target}" PROPERTIES INTERFACE_MODULE_INCLUDE_NAME "${module_include_name}")
@ -298,7 +297,6 @@ function(qt_internal_add_module target)
endif()
set_target_properties("${target}" PROPERTIES
INTERFACE_MODULE_HAS_HEADERS ON
_qt_module_has_headers ON)
### FIXME: Can we replace headers.pri?

2
cmake/QtPostProcessHelpers.cmake
View File

@ -247,7 +247,7 @@ function(qt_internal_create_module_depends_file target)
list(REMOVE_DUPLICATES qtdeps)
endif()
get_target_property(hasModuleHeaders "${target}" INTERFACE_MODULE_HAS_HEADERS)
get_target_property(hasModuleHeaders "${target}" _qt_module_has_headers)
if (${hasModuleHeaders})
get_target_property(module_include_name "${target}" INTERFACE_MODULE_INCLUDE_NAME)
qt_internal_write_depends_file(${module_include_name} ${qtdeps})

2
cmake/QtPriHelpers.cmake
View File

@ -263,7 +263,7 @@ ${framework_base_path}/${fw_private_module_header_dir}")
get_target_property(module_name_in_pri ${target} OUTPUT_NAME)
endif()
get_target_property(hasModuleHeaders ${target} INTERFACE_MODULE_HAS_HEADERS)
get_target_property(hasModuleHeaders ${target} _qt_module_has_headers)
if (NOT hasModuleHeaders)
unset(public_module_includes)
unset(private_module_includes)