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

CMake: Use private headers for internal module pri

Browse Source 
Just like config_module_name is appended by "_private" in the case of
internal module pri, replace module_includes with the private one.
It fixes the issue where a pro file that uses an internal module pri
does not build due to missing paths to private headers.

Fixes: QTBUG-89961
Change-Id: Ice16a1e9f709d29454f1ddf5b954673cc06a88bb
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
This commit is contained in:
Jaeyoon Jung 2021-01-08 13:48:16 +09:00 committed by Risto Avila
parent d939faeaae
commit f254d62cb1
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtPriHelpers.cmake
View File

@ -243,6 +243,8 @@ function(qt_generate_module_pri_file target)
if (arg_INTERNAL_MODULE) if (arg_INTERNAL_MODULE)
string(APPEND config_module_name "_private") string(APPEND config_module_name "_private")
# Internal module pri needs to provide private headers
set(public_module_includes "${private_module_includes}")
endif() endif()
qt_path_join(target_path ${QT_BUILD_DIR} ${INSTALL_MKSPECSDIR}/modules) qt_path_join(target_path ${QT_BUILD_DIR} ${INSTALL_MKSPECSDIR}/modules)