diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-17 13:04:59 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-17 19:32:56 +0200 |
| commit | 8aee7c6b29be5a0ee7d5e7cfcb5f2db762b2e28b (patch) | |
| tree | 08c866940ed18a43da52cde9711e080fe87ffa5d /cmake | |
| parent | d3b9759b42a1dfbd72a7e85b7a418224c1beedd4 (diff) | |
Fix internal module naming in qmake .pri files
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 3 | ||||
| -rw-r--r-- | cmake/QtPriHelpers.cmake | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 703ddde21b..853adbd3ac 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -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}") diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index daeb62ff8f..599ccb8c4d 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -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() |