summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2023-07-20 13:33:52 +0200
committerMarc Mutz <marc.mutz@qt.io>2023-07-21 12:31:45 +0200
commita07426d23a02bd4029c6576f92fa43d324ff56be (patch)
tree3087a0bd415fd7f61d7ced9ebbdee5ede4e6bbdd /src
parent510224f4463c2a372b83d91f0daf24a91069a9fe (diff)
QtCore: unbreak unity-build-batch-size 100000
Exclude TUs that cause problems in a build where all of QtCore'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: GCC 13, Ubuntu 20.04, -developer-build, C++23, -sctp. Task-number: QTBUG-115352 Pick-to: 6.6 6.5 Change-Id: If33a485b697f60a2f4d6198f0798c953fa47af51 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index f2da2c2b109..92bf04d7809 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -308,6 +308,7 @@ qt_internal_add_module(Core
tools/qvector.h
tools/qversionnumber.cpp tools/qversionnumber.h
NO_UNITY_BUILD_SOURCES
+ tools/qfreelist.cpp # Size0/Offset0 (also in qabstracteventdispatcher.cpp)
# MinGW complains about `free-nonheap-object` in ~QSharedDataPointer()
# despite the fact that appropriate checks are in place to avoid that!
tools/qshareddata.cpp tools/qshareddata.h
@@ -318,6 +319,7 @@ qt_internal_add_module(Core
text/qstringconverter.cpp # enum Data
tools/qcryptographichash.cpp # KeccakNISTInterface/Final
io/qdebug.cpp # undef qDebug
+ io/qsettings.cpp # Space (also in qjsonparser.cpp)
NO_PCH_SOURCES
compat/removed_api.cpp
global/qsimd.cpp
@@ -1148,6 +1150,8 @@ qt_internal_extend_target(Core CONDITION VXWORKS
qt_internal_extend_target(Core CONDITION QT_FEATURE_cborstreamreader
SOURCES
serialization/qcborstreamreader.cpp serialization/qcborstreamreader.h
+ NO_UNITY_BUILD_SOURCES
+ serialization/qcborstreamreader.cpp # some problem with cbor_value_get_type etc
)
qt_internal_extend_target(Core CONDITION QT_FEATURE_cborstreamwriter