diff options
| author | Tim Blechmann <tim@klingt.org> | 2024-02-09 10:56:03 +0800 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2024-02-10 03:08:19 +0000 |
| commit | 72f5793d2e6b8d749d7d6c9e3a6444f11e8b2cc0 (patch) | |
| tree | d6ad4460acff4f6fd2384ecb1602e8285989828a /qmake | |
| parent | a86321cb665b1af03b245b3b0fe0b57faa4a678f (diff) | |
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>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
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() |