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

QtCore/MSVC: Fix unity build error

Browse Source 
Exclude qassert.cpp, fixing:
error C2375: 'qAbort': redefinition; different linkage

Amends 23877db5639deca70dc8cc1a7299b2cee629c7d8.
Introduced by 907e9a8b293a0a4372ea474ad76e7507e7c7ebd9.

Change-Id: I03d6d31eda138a411d1972f683f46c0437f8d839
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 673605110e3a33db9b58e0c514e9ec8e4da36d20)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Friedemann Kleint 2024-09-04 10:33:20 +02:00 committed by Qt Cherry-pick Bot
parent b245808d97
commit e63847cab5
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/CMakeLists.txt
View File

@ -320,6 +320,7 @@ qt_internal_add_module(Core
# despite the fact that appropriate checks are in place to avoid that!
tools/qshareddata.cpp tools/qshareddata.h
text/qlocale.cpp text/qlocale.h
global/qassert.cpp # Windows: inconsistent linkage of qAbort()
global/qglobal.cpp # undef qFatal
global/qlogging.cpp # undef qFatal/qInfo/qDebug
global/qrandom.cpp # undef Q_ASSERT/_X