From 98ac56676ace9440bba2b96c9fb719f23b18a54e Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Wed, 2 May 2012 13:14:07 +0200
Subject: [PATCH] Avoid macro re-definition warning for QT_NO_EXCEPTIONS

Change-Id: I0c4b2d00dd567af17f22b733b93032ff1056fcbd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/global/qcompilerdetection.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h
index e2dd16f7a0..a971bfdf12 100644
--- a/src/corelib/global/qcompilerdetection.h
+++ b/src/corelib/global/qcompilerdetection.h
@@ -505,7 +505,9 @@
 #ifdef Q_CC_CLANG
 /* General C++ features */
 #  if !__has_feature(cxx_exceptions)
-#    define QT_NO_EXCEPTIONS
+#    ifndef QT_NO_EXCEPTIONS
+#      define QT_NO_EXCEPTIONS
+#    endif
 #  endif
 #  if !__has_feature(cxx_rtti)
 #    define QT_NO_RTTI