From 673605110e3a33db9b58e0c514e9ec8e4da36d20 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 4 Sep 2024 10:33:20 +0200
Subject: [PATCH] QtCore/MSVC: Fix unity build error

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

Amends 23877db5639deca70dc8cc1a7299b2cee629c7d8.
Introduced by 907e9a8b293a0a4372ea474ad76e7507e7c7ebd9.

Pick-to: 6.8
Change-Id: I03d6d31eda138a411d1972f683f46c0437f8d839
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 src/corelib/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index b1fcf365003..7385b0f27e6 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -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