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

Windows: Fix qAbort() definition for MSVC with unity build

Browse Source 
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>
This commit is contained in:
Nodir Temirkhodjaev 2024-07-12 16:02:19 +05:00 committed by Friedemann Kleint
parent 9e7eef5def
commit 631a4285b4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qassert.cpp
View File

@ -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