Skip to content

Commit

Permalink
QtCore/MSVC: Fix unity build error
Browse files Browse the repository at this point in the history
Exclude qassert.cpp, fixing:
error C2375: 'qAbort': redefinition; different linkage

Amends 23877db.
Introduced by 907e9a8.

Pick-to: 6.8
Change-Id: I03d6d31eda138a411d1972f683f46c0437f8d839
Reviewed-by: Volker Hilsheimer <[email protected]>
  • Loading branch information
FriedemannKleint committed Sep 10, 2024
1 parent 202dd3c commit 6736051
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/corelib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,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
Expand Down

0 comments on commit 6736051

Please sign in to comment.