1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: make unity-buildable

Browse Source 
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.6 6.5
Change-Id: I46443ec979142ab2ebb686f9444b37e1043f0af1
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 72f5793d2e6b8d749d7d6c9e3a6444f11e8b2cc0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tim Blechmann 2024-02-09 10:56:03 +08:00 committed by Qt Cherry-pick Bot
parent cddf6498d3
commit 5ef06fd8d1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/CMakeLists.txt
View File

@ -58,7 +58,6 @@ qt_internal_add_tool(${target_name}
TRY_RUN TRY_RUN
TOOLS_TARGET Core TOOLS_TARGET Core
USER_FACING USER_FACING
NO_UNITY_BUILD
INSTALL_VERSIONED_LINK INSTALL_VERSIONED_LINK
SOURCES SOURCES
cachekeys.h cachekeys.h
@ -99,6 +98,9 @@ qt_internal_add_tool(${target_name}
"qmake_pch.h" "qmake_pch.h"
LIBRARIES LIBRARIES
QtLibraryInfo 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() qt_internal_return_unless_building_tools()