aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/CMakeLists.txt
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2023-07-20 22:07:26 +0200
committerMarc Mutz <marc.mutz@qt.io>2023-07-21 10:28:13 +0200
commit174e3fd02600d119f424c8e840d4e1794dfd0832 (patch)
treea230928fc5c11fc7b278614fa3c4d3e9b9d9e085 /src/quick/CMakeLists.txt
parent517ea74cac96c1306431b96e6118f672a7ad6c14 (diff)
QtQuick: unbreak unity-build-batch-size 100000
Exclude TUs that cause problems in a build where all of QtQuick'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++, ... Task-number: QTBUG-115140 Pick-to: 6.6 6.5 Change-Id: Iea1fd344541b966add097a7e0c144a427edabd94 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/quick/CMakeLists.txt')
-rw-r--r--src/quick/CMakeLists.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index c70a18f154..fbfab68160 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -207,6 +207,11 @@ qt_internal_add_qml_module(Quick
util/qquickvalidator.cpp util/qquickvalidator_p.h
util/qquickvaluetypes.cpp util/qquickvaluetypes_p.h
util/qquickframeanimation.cpp util/qquickframeanimation_p.h
+ NO_UNITY_BUILD_SOURCES
+ scenegraph/qsgdefaultcontext.cpp # redefinition of 'qmlDisableDistanceField' (from qquicktextinput.cpp)
+ scenegraph/util/qsgtexturematerial.cpp # redefinition of 'isPowerOfTwo' (from qsgdefaultinternalimagenode.cpp)
+ util/qquickvalidator.cpp # expl. spec. of 'QMetaTypeId<QValidator *>' after inst.
+ quick_qmltyperegistrations.cpp # qquickvalidator_p.h: error: explicit specialization of 'QMetaTypeId<QValidator *>' after instantiation
DEFINES
QT_NO_FOREACH
QT_NO_INTEGER_EVENT_COORDINATES
@@ -473,6 +478,8 @@ qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_positioners
SOURCES
items/qquickpositioners.cpp items/qquickpositioners_p.h
items/qquickpositioners_p_p.h
+ NO_UNITY_BUILD_SOURCES
+ items/qquickpositioners.cpp # redefinition of 'watchedChanges' (from qquickloader.cpp)
)
qt_internal_extend_target(Quick CONDITION QT_FEATURE_quick_flipable