1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exclude sources from the Unity Build

Browse Source 
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 <alexandru.croitor@qt.io>
This commit is contained in:
Amir Masoud Abdol 2023-04-11 10:32:15 +02:00
parent 7199498fb9
commit db9fa4a617
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/CMakeLists.txt
View File

@ -589,6 +589,8 @@ qt_internal_extend_target(Core CONDITION APPLE
# This makes sure that the tst_qmakelib passes. For some reason, # This makes sure that the tst_qmakelib passes. For some reason,
# QtCore ends up returning a corrupted error message in # QtCore ends up returning a corrupted error message in
# write_file(): fail # 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 qt_internal_extend_target(Core CONDITION MACOS

4
src/network/CMakeLists.txt
View File

@ -174,6 +174,10 @@ qt_internal_extend_target(Network CONDITION UNIX
kernel/qhostinfo_unix.cpp kernel/qhostinfo_unix.cpp
socket/qnativesocketengine_unix.cpp socket/qnativesocketengine_unix.cpp
socket/qnet_unix_p.h 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 qt_internal_extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX