QtCore: Add more exclusions for Unity builds
Removed `_DEFAULT_SOURCE` as it was not consistent, and possible didn't
work in the first place, and was masked by the exclusion of
`io/qfilesystemengine_unix.cpp`.
Amends fc3a9ee601.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I8036e66d29d5ec88608d284436b4e8719144f06d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
parent
465438e1b1
commit
3c1bea178c
|
|
@ -625,11 +625,10 @@ qt_internal_extend_target(Core CONDITION UNIX
|
|||
thread/qthread_unix.cpp
|
||||
)
|
||||
|
||||
# Necessary for defining DT_* macros, otherwise they cause
|
||||
# error during UNITY_BUILD.
|
||||
qt_internal_extend_target(Core CONDITION APPLE
|
||||
DEFINES
|
||||
_DEFAULT_SOURCE
|
||||
NO_UNITY_BUILD_SOURCES
|
||||
io/qfilesystemengine_unix.cpp # avoid undefined DT_* macros
|
||||
io/qlockfile_unix.cpp # avoid undefined SOCK_MAXADDRLEN (in proc_info.h)
|
||||
)
|
||||
|
||||
qt_internal_extend_target(Core CONDITION QT_FEATURE_thread
|
||||
|
|
@ -1288,6 +1287,8 @@ set_source_files_properties(serialization/qcborstreamwriter.cpp # CBOR macro cla
|
|||
io/forkfd_qt.cpp # EINTR_LOOP macro clashes
|
||||
global/qglobal.cpp # undef qFatal
|
||||
global/qlogging.cpp # undef qFatal
|
||||
text/qstringconverter.cpp # enum Data
|
||||
tools/qcryptographichash.cpp # KeccakNISTInterface/Final
|
||||
${corelib_no_pch_sources} # NO_PCH_SOURCES
|
||||
PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue