summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2023-03-30 14:46:16 +0200
committerAlexey Edelev <alexey.edelev@qt.io>2023-03-31 14:10:03 +0200
commitf9594cefef0d86b33d21319fefe4fa71049416c7 (patch)
tree76f51308284f061e21527563a16b542f7f5aecf5 /cmake
parentc5c3a7e0db75e0e8a41a2b99ab40c7d803bc905c (diff)
downloadqtbase-f9594cefef0d86b33d21319fefe4fa71049416c7.tar.gz
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 <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtSyncQtHelpers.cmake2
1 files changed, 1 insertions, 1 deletions
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}