whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Exclude files from unity build" 

This reverts commit e0cec08480.

Reason for revert: this can't possibly be the correct solution. It
set properties in headers (not .cpp sources) and headers can't cause
a build issue because they aren't built. Moreover, the problems
were seen in another module, so the properties set in those files
shouldn't even be visible to CMake.

Change-Id: I8473bb819e768bd203f89034d18132186da0371c
Pick-to: 6.5
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
bb10
Thiago Macieira 2023-04-24 18:53:21 +00:00
parent d09855ae7b
commit 0198611fd4
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/CMakeLists.txt
View File

@ -550,14 +550,6 @@ qt_internal_extend_target(Core CONDITION WIN32
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)
### Qt7: remove
# Make qwineventnotifier.h available on non-Windows platforms too for code bases that include