From ee1e37cc64bf68f221e80dd0aa11c571f2e40a33 Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Wed, 12 Sep 2012 14:27:18 +0200
Subject: [PATCH] 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>
---
 src/corelib/global/qglobal.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index df4eb0e..c9a73c5 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.
-- 
2.7.4