diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-07-21 22:55:48 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-08-07 07:08:42 +0000 |
| commit | 590f80294a546128d3467cd1717357795e2332d6 (patch) | |
| tree | b52fa0a38260b542006fef064f426076064204fe | |
| parent | 5433296e3ba00cc1c78beacb7083ff5e6645bc8c (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).
Manual conflict resolutions:
- back-tracked across file move
src/qdoc/qdoc/CMakeFiles.txt <- src/qdoc/CMakeFiles.txt
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/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qdoc/CMakeLists.txt b/src/qdoc/CMakeLists.txt index 9d8682279..2501335ec 100644 --- a/src/qdoc/CMakeLists.txt +++ b/src/qdoc/CMakeLists.txt @@ -82,6 +82,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 |