summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2023-07-21 22:55:48 +0200
committerMarc Mutz <marc.mutz@qt.io>2023-08-08 11:44:36 +0000
commit126f238d7e8f100c275e2c6407a758d0d6a3c50e (patch)
tree1ae53405a6e6b084e7706688cbce0899c671dca1
parentd10e6d9bff180afe3cbb44a6f8e45646b11ef2df (diff)
QDoc: unbreak unity-build-batch-size 100000
Exclude TUs that cause problems in a build where all of QDoc's .cpp files end up in a single unity_0_cxx.cxx. This should ensure that the build will forthwith not fail because someone added a new .cpp file in the "wrong" position. Of course, this is just a snapshot, with my configuration: Clang 15, Ubuntu 20.04, -developer-build, C++23, -sctp, libc++ (which means I can't link most of the tools, because of problems similar to QTBUG-115032). Task-number: QTBUG-115448 Change-Id: I6f7411d0e18150ac623ab128c72f6fe69876c33c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 66986604f4f214fd11b17840dc4b8a78036b53a1) Reviewed-by: Marc Mutz <marc.mutz@qt.io>
-rw-r--r--src/qdoc/qdoc/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qdoc/qdoc/CMakeLists.txt b/src/qdoc/qdoc/CMakeLists.txt
index ee3516e12..209ff745d 100644
--- a/src/qdoc/qdoc/CMakeLists.txt
+++ b/src/qdoc/qdoc/CMakeLists.txt
@@ -81,6 +81,8 @@ qt_internal_add_tool(${target_name}
variablenode.cpp
webxmlgenerator.cpp
xmlgenerator.cpp
+ NO_UNITY_BUILD_SOURCES
+ qmlmarkupvisitor.cpp # redefinition of 'samp'/'slt' (from codemarker.cpp)
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_LIST_DIR}
LIBRARIES