diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-02-21 19:34:46 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-02-21 19:42:55 (GMT) |
| commit | 40ef3923c8fb352db7c911ac8b264408724710ca (patch) | |
| tree | 469293bda4d811b30412e58a79c024b370b48423 /src | |
| parent | 5a99e0ed90e0f53ef634b5776babc87a2a3397bf (diff) | |
| download | Qt-40ef3923c8fb352db7c911ac8b264408724710ca.zip Qt-40ef3923c8fb352db7c911ac8b264408724710ca.tar.gz Qt-40ef3923c8fb352db7c911ac8b264408724710ca.tar.bz2 | |
Add Intel Compiler's C++0x feature support macros
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 960fe6e..c7abe1d 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -460,7 +460,6 @@ namespace QT_NAMESPACE {} # if defined(__INTEL_COMPILER) /* Intel C++ also masquerades as GCC 3.2.0 */ # define Q_CC_INTEL -# define Q_NO_TEMPLATE_FRIENDS # endif # if defined(__clang__) /* Clang also masquerades as GCC 4.2.1 */ @@ -763,6 +762,22 @@ namespace QT_NAMESPACE {} # error "Qt has not been tested with this compiler - talk to qt-bugs@trolltech.com" #endif +#ifdef Q_CC_INTEL +# if __INTEL_COMPILER < 1200 +# define Q_NO_TEMPLATE_FRIENDS +# endif +# if __INTEL_COMPILER >= 1100 +# define Q_COMPILER_RVALUE_REFS +# define Q_COMPILER_EXTERN_TEMPLATES +# elif __INTEL_COMPILER >= 1200 +# define Q_COMPILER_VARIADIC_TEMPLATES +# define Q_COMPILER_AUTO_TYPE +# define Q_COMPILER_DEFAULT_DELETE_MEMBERS +# define Q_COMPILER_CLASS_ENUM +# define Q_COMPILER_LAMBDA +# endif +#endif + #ifndef Q_PACKED # define Q_PACKED # undef Q_NO_PACKED_REFERENCE |