diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-13 12:22:12 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-07-13 12:49:31 +0200 |
| commit | a81093b9150b2f1727de6e9e77b8bdddb1c909ee (patch) | |
| tree | 503ca465bbb633758c67e1f96987ed375f3c95ad /src/corelib/global/qglobal.h | |
| parent | 2770415f921d494e30e9a770c40b538d223351d6 (diff) | |
| parent | 718153cfa03f336be2557da058c879de63cfa792 (diff) | |
Merge remote-tracking branch 'origin/master' into refactor
Change-Id: I53c78056abde99198ffe1c67f7f9e90b4b08051d
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 844fe0528e..4960d2a245 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -540,6 +540,7 @@ namespace QT_NAMESPACE {} # define Q_COMPILER_DEFAULT_DELETE_MEMBERS # define Q_COMPILER_CLASS_ENUM # define Q_COMPILER_INITIALIZER_LISTS +# define Q_COMPILER_ATOMICS # endif # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 405 /* C++0x features supported in GCC 4.5: */ @@ -547,7 +548,10 @@ namespace QT_NAMESPACE {} # endif # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 406 /* C++0x features supported in GCC 4.6: */ +# define Q_COMPILER_NULLPTR # define Q_COMPILER_CONSTEXPR +# define Q_COMPILER_UNRESTRICTED_UNIONS +# define Q_COMPILER_RANGE_FOR # endif # endif @@ -799,11 +803,10 @@ namespace QT_NAMESPACE {} # define Q_NO_TEMPLATE_FRIENDS # endif # if defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__GXX_EXPERIMENTAL_CPP0X__) -# if __INTEL_COMPILER >= 1100 +# if __INTEL_COMPILER >= 1200 # define Q_COMPILER_RVALUE_REFS # define Q_COMPILER_EXTERN_TEMPLATES # define Q_COMPILER_DECLTYPE -# elif __INTEL_COMPILER >= 1200 # define Q_COMPILER_VARIADIC_TEMPLATES # define Q_COMPILER_AUTO_TYPE # define Q_COMPILER_DEFAULT_DELETE_MEMBERS @@ -1114,6 +1117,12 @@ redefine to built-in booleans to make autotests work properly */ # define QT_FASTCALL #endif +#ifdef Q_COMPILER_NULLPTR +# define Q_NULLPTR nullptr +#else +# define Q_NULLPTR 0 +#endif + #ifdef Q_COMPILER_CONSTEXPR # define Q_DECL_CONSTEXPR constexpr #else |