From f9594cefef0d86b33d21319fefe4fa71049416c7 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 30 Mar 2023 14:46:16 +0200 Subject: [PATCH] Add the missing list of the generatedHeaders to syncqt_all_args We need to pass the list of generated files to make the correct filtering when generating the module master header. Otherwise generated headers will endup in the module master header. Pick-to: 6.5 Fixes: QTBUG-112458 Change-Id: Icd20fe5999db379d0eafbff7dad20765e1a96350 Reviewed-by: Alexandru Croitor --- cmake/QtSyncQtHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtSyncQtHelpers.cmake b/cmake/QtSyncQtHelpers.cmake index cbab85b19a..e426b6ea0b 100644 --- a/cmake/QtSyncQtHelpers.cmake +++ b/cmake/QtSyncQtHelpers.cmake @@ -104,6 +104,7 @@ function(qt_internal_target_sync_headers target module_headers module_headers_ge -includeDir "${module_build_interface_include_dir}" -privateIncludeDir "${module_build_interface_private_include_dir}" -qpaIncludeDir "${module_build_interface_qpa_include_dir}" + -generatedHeaders ${module_headers_generated} ${qpa_filter_argument} ${public_namespaces_filter} ${non_qt_module_argument} @@ -140,7 +141,6 @@ function(qt_internal_target_sync_headers target module_headers module_headers_ge list(APPEND syncqt_args ${common_syncqt_arguments} -headers ${module_headers} - -generatedHeaders ${module_headers_generated} -stagingDir "${syncqt_staging_dir}" -knownModules ${known_modules} ${framework_args}