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

Fix internal module naming in qmake .pri files

Browse Source 
Set the correct value to the _qt_config_module_name property at the
internal module creating step instead of appending _private suffix when
generating .pri files.

Amends 425ff34aa10a02524f2d52f544dc00b539ef9a26

Pick-to: 6.2
Fixes: QTBUG-94568
Change-Id: I6fa8089358bc638668e313c98c3aee680bf7ec2a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2021-06-17 13:04:59 +02:00
parent d3b9759b42
commit 8aee7c6b29
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/QtModuleHelpers.cmake
View File

@ -142,6 +142,9 @@ function(qt_internal_add_module target)
set(property_prefix "")
endif()
if(arg_INTERNAL_MODULE)
string(APPEND arg_CONFIG_MODULE_NAME "_private")
endif()
set_target_properties(${target} PROPERTIES
_qt_config_module_name "${arg_CONFIG_MODULE_NAME}"
${property_prefix}QT_QMAKE_MODULE_CONFIG "${arg_QMAKE_MODULE_CONFIG}")

1
cmake/QtPriHelpers.cmake
View File

@ -246,7 +246,6 @@ ${framework_base_path}/${fw_private_module_header_dir}")
set(config_module_name_base "${config_module_name}")
if (arg_INTERNAL_MODULE)
string(APPEND config_module_name "_private")
# Internal module pri needs to provide private headers
set(public_module_includes "${private_module_includes}")
endif()