From 631a4285b4e2c25d0d27af378447d250e43117fb Mon Sep 17 00:00:00 2001
From: Nodir Temirkhodjaev <nodir.temir@gmail.com>
Date: Fri, 12 Jul 2024 16:02:19 +0500
Subject: [PATCH] Windows: Fix qAbort() definition for MSVC with unity build

src\corelib\global\qglobal_p.h(57): error C2381: 'qAbort': redefinition; 'noreturn' differs
src/corelib/global/qassert.cpp(24): note: see declaration of 'qAbort'

The error started after 1ef5f50e, when unity build source files changed.

Change-Id: Id90ee20976423b9ae6ec691ee15602256f7c1fe9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 23877db5639deca70dc8cc1a7299b2cee629c7d8)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 src/corelib/global/qassert.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/global/qassert.cpp b/src/corelib/global/qassert.cpp
index 7c0064ac2ff..b958dd40fd5 100644
--- a/src/corelib/global/qassert.cpp
+++ b/src/corelib/global/qassert.cpp
@@ -21,7 +21,7 @@
 
 QT_BEGIN_NAMESPACE
 
-void qAbort()
+Q_NORETURN void qAbort()
 {
 #ifdef Q_OS_WIN
     // std::abort() in the MSVC runtime will call _exit(3) if the abort