Skip to content

Commit

Permalink
qmake: make unity-buildable
Browse files Browse the repository at this point in the history
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.5
Change-Id: I46443ec979142ab2ebb686f9444b37e1043f0af1
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 72f5793)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 5ef06fd)
  • Loading branch information
timblechmann authored and Qt Cherry-pick Bot committed Feb 14, 2024
1 parent 1fdfdb0 commit 4f0c618
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion qmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()

Expand Down

0 comments on commit 4f0c618

Please sign in to comment.