summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaeyoon Jung <jaeyoon.jung@lge.com>2021-01-08 13:48:16 +0900
committerRisto Avila <risto.avila@qt.io>2021-01-20 07:35:43 +0000
commitf254d62cb1807d5bd9ee2e23ef64d4ca2d1b6809 (patch)
tree2f358c08c0ef73ab1d300b54398df02461923b46
parentd939faeaaeb911eb3fcc346902f7e8f23cf0d2b8 (diff)
CMake: Use private headers for internal module pri
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>
-rw-r--r--cmake/QtPriHelpers.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
index e77e98fe76..47be8a6194 100644
--- a/cmake/QtPriHelpers.cmake
+++ b/cmake/QtPriHelpers.cmake
@@ -243,6 +243,8 @@ function(qt_generate_module_pri_file target)
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()
qt_path_join(target_path ${QT_BUILD_DIR} ${INSTALL_MKSPECSDIR}/modules)