From 72f5793d2e6b8d749d7d6c9e3a6444f11e8b2cc0 Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Fri, 9 Feb 2024 10:56:03 +0800
Subject: qmake: make unity-buildable

msvc_objectmodel.cpp and qmakeparser.cpp have symbols that may clash.
Removing them from unity builds allows qmake to be unity-built.

Pick-to: 6.7 6.6 6.5
Change-Id: I46443ec979142ab2ebb686f9444b37e1043f0af1
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
---
 qmake/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'qmake/CMakeLists.txt')

diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt
index 836b49c223..5a54570194 100644
--- a/qmake/CMakeLists.txt
+++ b/qmake/CMakeLists.txt
@@ -58,7 +58,6 @@ qt_internal_add_tool(${target_name}
     TRY_RUN
     TOOLS_TARGET Core
     USER_FACING
-    NO_UNITY_BUILD
     INSTALL_VERSIONED_LINK
     SOURCES
         cachekeys.h
@@ -99,6 +98,9 @@ qt_internal_add_tool(${target_name}
         "qmake_pch.h"
     LIBRARIES
         QtLibraryInfo
+    NO_UNITY_BUILD_SOURCES
+        generators/win32/msvc_objectmodel.cpp # xml symbols clash with generators/win32/msbuild_objectmodel.cpp
+        library/qmakeparser.cpp               # struct statics clashes with qmakeevaluator_p.h
 )
 qt_internal_return_unless_building_tools()
 
-- 
cgit v1.2.3