From e21c4be5d6a4296dd09ecff34ff7f789dfe2f479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20K=C3=B6hne?= <kai.koehne@qt.io>
Date: Fri, 5 May 2023 12:46:21 +0200
Subject: [PATCH] Unconditionally use Q_NORETURN for qAbort()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The exception for MSVC was probably added due to similar logic in
qlogging.h, but in this case, qAbort never returns also with MSVC.

Change-Id: Ica2155c34d4b32b20af5b1fcb5af35bb3ff6f668
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/corelib/global/qglobal_p.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/corelib/global/qglobal_p.h b/src/corelib/global/qglobal_p.h
index 8b1a6ba149..31f67510e3 100644
--- a/src/corelib/global/qglobal_p.h
+++ b/src/corelib/global/qglobal_p.h
@@ -54,10 +54,7 @@
 #if defined(__cplusplus)
 QT_BEGIN_NAMESPACE
 
-#if !defined(Q_CC_MSVC) || defined(Q_CC_CLANG)
-Q_NORETURN
-#endif
-Q_CORE_EXPORT void qAbort();
+Q_NORETURN Q_CORE_EXPORT void qAbort();
 
 QT_END_NAMESPACE