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 <[email protected]>
ClassAteam · Apr 11, 2023 · db9fa4a · db9fa4a
1 parent 7199498
commit db9fa4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -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