From b91891a76bc2d9b47ba84e9ebefeccd77a76a87e Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 20 Jul 2023 13:33:52 +0200 Subject: [PATCH] QtWidgets: unbreak unity-build-batch-size 100000 Exclude TUs that cause problems in a build where all of QtWidgets'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: I6a445701e2ac41d67a3ec69715b7bf6ed5ec65f7 Reviewed-by: Alexandru Croitor --- src/widgets/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index cf00dff0c10..9a508cc14e1 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -662,6 +662,8 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_inputdialog qt_internal_extend_target(Widgets CONDITION QT_FEATURE_messagebox SOURCES dialogs/qmessagebox.cpp dialogs/qmessagebox.h + NO_UNITY_BUILD_SOURCES + dialogs/qmessagebox.cpp # error: ‘Old_Ok’ [etc] was not declared in this scope ) if(QT_FEATURE_messagebox)