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

CMake: Fix unity build for gcc < 13

Browse Source 
GCC 12 erroneously yields -Wsubobject-linkage in a unity build.
Un-unity qresource.cpp for GCC 12 and older.

Change-Id: Ie3aced2668ec8aae797d89ce28a3e5917a6e8f88
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit a06e54d2c88934f1511768d7254e12e6294e6336)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Joerg Bornemann 2024-07-04 11:14:31 +02:00 committed by Qt Cherry-pick Bot
parent 4865577518
commit 11592ad3fc
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/CMakeLists.txt
View File

@ -594,6 +594,11 @@ qt_internal_extend_target(Core CONDITION WIN32
tools/qhash.cpp # Q_DECL_INIT_PRIORITY
)
qt_internal_extend_target(Core CONDITION GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "13"
NO_UNITY_BUILD_SOURCES
io/qresource.cpp io/qresource.h io/qresource_p.h # -Werror=subobject-linkage
)
if(NOT WIN32)
### Qt7: remove
# Make qwineventnotifier.h available on non-Windows platforms too for code bases that include