diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2012-09-12 14:27:18 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-12 15:24:17 +0200 |
| commit | ee1e37cc64bf68f221e80dd0aa11c571f2e40a33 (patch) | |
| tree | 73e49e630fa08537fc5d78bf1b60d673065e8768 /src/corelib/global | |
| parent | e0a847dca94230617c120f5e6bbe29975aa31688 (diff) | |
Fix build with QT_NO_EXCEPTIONS
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>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index df4eb0ecf4..c9a73c5403 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1920,6 +1920,7 @@ void qBadAlloc() QT_THROW(std::bad_alloc()); } +#ifndef QT_NO_EXCEPTIONS /* \internal Allows you to call std::terminate() without including <exception>. @@ -1929,6 +1930,7 @@ Q_NORETURN void qTerminate() Q_DECL_NOTHROW { std::terminate(); } +#endif /* The Q_ASSERT macro calls this function when the test fails. |