diff options
Diffstat (limited to 'src/corelib/global/qcompilerdetection.h')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index be167f2a2a..57cba10d6b 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -632,6 +632,11 @@ # define Q_COMPILER_NULLPTR # define Q_COMPILER_UNRESTRICTED_UNIONS # define Q_COMPILER_RANGE_FOR +# if __GNUC__ == 4 && __GNUC_MINOR__ == 6 && __GNUC_PATCHLEVEL__ < 2 + /* GCC 4.6.0 and 4.6.1 have a problem dealing with noexcept expressions, + * so turn the feature off for those versions */ +# undef Q_COMPILER_NOEXCEPT +# endif # endif # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 407 /* C++11 features supported in GCC 4.7: */ |