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

QtCore: Add more exclusions for Unity builds

Browse Source 
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 fc3a9ee60159b2391cba2320cfdeeddb94d781f8.

Task-number: QTBUG-109394
Change-Id: I8036e66d29d5ec88608d284436b4e8719144f06d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 3c1bea178c3e23719dd98d931c056e34a680ff3c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Friedemann Kleint 2023-02-20 08:27:55 +01:00 committed by Qt Cherry-pick Bot
parent 5d705f0f94
commit c86ea25b60
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/CMakeLists.txt
View File

@ -624,11 +624,10 @@ qt_internal_extend_target(Core CONDITION UNIX
thread/qthread_unix.cpp thread/qthread_unix.cpp
) )
# Necessary for defining DT_* macros, otherwise they cause
# error during UNITY_BUILD.
qt_internal_extend_target(Core CONDITION APPLE qt_internal_extend_target(Core CONDITION APPLE
DEFINES NO_UNITY_BUILD_SOURCES
_DEFAULT_SOURCE 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 qt_internal_extend_target(Core CONDITION QT_FEATURE_thread
@ -1276,6 +1275,8 @@ set_source_files_properties(serialization/qcborstreamwriter.cpp # CBOR macro cla
io/forkfd_qt.cpp # EINTR_LOOP macro clashes io/forkfd_qt.cpp # EINTR_LOOP macro clashes
global/qglobal.cpp # undef qFatal global/qglobal.cpp # undef qFatal
global/qlogging.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 ${corelib_no_pch_sources} # NO_PCH_SOURCES
PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON) PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)