diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-05-02 13:14:07 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-02 14:53:41 +0200 |
| commit | 98ac56676ace9440bba2b96c9fb719f23b18a54e (patch) | |
| tree | 993913d60817144fd90b624a113f05de85bee46b /src | |
| parent | 8dd66f42e834320c4ba0a6f2e45855d591b3b6e7 (diff) | |
Avoid macro re-definition warning for QT_NO_EXCEPTIONS
Change-Id: I0c4b2d00dd567af17f22b733b93032ff1056fcbd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 |