Avoid macro re-definition warning for QT_NO_EXCEPTIONS

Change-Id: I0c4b2d00dd567af17f22b733b93032ff1056fcbd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-05-02 13:14:07 +02:00 · 2012-05-02 13:14:07 +02:00 · 98ac56676a
commit 98ac56676a
parent 8dd66f42e8
1 changed files with 3 additions and 1 deletions
--- 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