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

Fix build with QT_NO_EXCEPTIONS

Browse Source 
qTerminate is declared within a #ifndef QT_NO_EXCEPTIONS block, so the
implementation must use the same #ifdef

Change-Id: I5d2d58a55fce5084c0538d18a9dd3998b12ed703
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Arvid Picciani <aep@exys.org>
This commit is contained in:
Harald Fernengel 2012-09-12 14:27:18 +02:00 committed by Qt by Nokia
parent e0a847dca9
commit ee1e37cc64
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1920,6 +1920,7 @@ void qBadAlloc()
QT_THROW(std::bad_alloc()); QT_THROW(std::bad_alloc());
} }
#ifndef QT_NO_EXCEPTIONS
/* /*
\internal \internal
Allows you to call std::terminate() without including <exception>. Allows you to call std::terminate() without including <exception>.
@ -1929,6 +1930,7 @@ Q_NORETURN void qTerminate() Q_DECL_NOTHROW
{ {
std::terminate(); std::terminate();
} }
#endif
/* /*
The Q_ASSERT macro calls this function when the test fails. The Q_ASSERT macro calls this function when the test fails.