From f5445e74b54d96ca215f5c8b01874174a4efbd9f Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 8 Feb 2023 15:11:07 +0100
Subject: Exclude sources generated by the scanner from CMake Unity (Jumbo)
 builds

The generated helper function wlRegistryBind() clashes.

Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: Ib814d4576c7565b0413ca16bc0bf5e95caa92c33
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
---
 src/client/Qt6WaylandClientMacros.cmake | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/client/Qt6WaylandClientMacros.cmake b/src/client/Qt6WaylandClientMacros.cmake
index 9fcec57d..c7ac0852 100644
--- a/src/client/Qt6WaylandClientMacros.cmake
+++ b/src/client/Qt6WaylandClientMacros.cmake
@@ -86,12 +86,14 @@ function(qt6_generate_wayland_protocol_client_sources target)
             DEPENDS ${protocol_file} Qt6::qtwaylandscanner
         )
 
-        target_sources(${target} PRIVATE
-            "${waylandscanner_header_output}"
+        set(sources "${waylandscanner_header_output}"
             "${waylandscanner_code_output}"
             "${qtwaylandscanner_header_output}"
-            "${qtwaylandscanner_code_output}"
-        )
+            "${qtwaylandscanner_code_output}")
+
+        target_sources(${target} PRIVATE ${sources})
+
+        set_source_files_properties(${sources} PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
     endforeach()
     target_include_directories(${target} PRIVATE ${target_binary_dir})
 endfunction()
-- 
cgit v1.2.1