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

Exclude files from unity build

Browse Source 
If not excluded, some of the macros in X11.h and Xlib.h conflicts with
symbols defined in `UrlFormattingOption` and `Type` in `qurl.h` and
`qjsonvalue.h`.

Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: Ic1b056f0bcd6643394401bca464f751b3489202d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Amir Masoud Abdol 2023-04-24 14:15:31 +02:00
parent 787038bb1d
commit e0cec08480
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/CMakeLists.txt
View File

@ -550,6 +550,14 @@ qt_internal_extend_target(Core CONDITION WIN32
tools/qhash.cpp # Q_DECL_INIT_PRIORITY tools/qhash.cpp # Q_DECL_INIT_PRIORITY
) )
qt_internal_extend_target(Core CONDITION LINUX
NO_UNITY_BUILD_SOURCES
# Some of the macros in X11.h and Xlib.h are colliding with
# symbols defined in some of the enums, e.g., None.
io/qurl.h
serialization/qjsonvalue.h
)
if(NOT WIN32) if(NOT WIN32)
### Qt7: remove ### Qt7: remove
# Make qwineventnotifier.h available on non-Windows platforms too for code bases that include # Make qwineventnotifier.h available on non-Windows platforms too for code bases that include