From db9fa4a61791794823e570f8aa7f6e5eed8c5f52 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Tue, 11 Apr 2023 10:32:15 +0200 Subject: [PATCH] Exclude sources from the Unity Build There are patches for addressing the issues raised by these two source files; however, it would be beneficial to exclude them temporary while we are testing, and debugging the unity build on CI. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: Ie8631cf1df086b22967a8cc41874a3ef856c3ef8 Reviewed-by: Alexandru Croitor --- src/corelib/CMakeLists.txt | 2 ++ src/network/CMakeLists.txt | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index d3d977498f4..aeea45eaa0b 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -589,6 +589,8 @@ qt_internal_extend_target(Core CONDITION APPLE # This makes sure that the tst_qmakelib passes. For some reason, # QtCore ends up returning a corrupted error message in # write_file(): fail + kernel/qelapsedtimer_mac.cpp # Temporary exclusion, until this, + # https://codereview.qt-project.org/c/qt/qtbase/+/462132, is merged ) qt_internal_extend_target(Core CONDITION MACOS diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 789f04c1230..2ff3c4b3d9c 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -174,6 +174,10 @@ qt_internal_extend_target(Network CONDITION UNIX kernel/qhostinfo_unix.cpp socket/qnativesocketengine_unix.cpp socket/qnet_unix_p.h + NO_UNITY_BUILD_SOURCES + kernel/qhostinfo_unix.cpp # Temporary exclusion until, this, + # https://codereview.qt-project.org/c/qt/qtbase/+/463670 + # is merged. ) qt_internal_extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX