diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 17:39:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 17:39:06 (GMT) |
| commit | 449a3b9e3de6f48328ce70fa7a4795746d8d34e4 (patch) | |
| tree | e7acbd619b30f5f2d49576fe5a308fbafe90ff0c | |
| parent | 60ceb77c576bc736924b337c457f82900e34c645 (diff) | |
| parent | 8eed664a8d23d7f61ed0dc8c4a3647384fe3f5f8 (diff) | |
| download | Qt-449a3b9e3de6f48328ce70fa7a4795746d8d34e4.zip Qt-449a3b9e3de6f48328ce70fa7a4795746d8d34e4.tar.gz Qt-449a3b9e3de6f48328ce70fa7a4795746d8d34e4.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Adding C++0x support to MSVC2010
| -rw-r--r-- | src/corelib/global/qglobal.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 02196e4..b0a24b0 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -400,6 +400,19 @@ namespace QT_NAMESPACE {} # undef QT_HAVE_3DNOW # endif +#if defined(Q_CC_MSVC) && _MSC_VER >= 1600 +# define Q_COMPILER_RVALUE_REFS +# define Q_COMPILER_INITIALIZER_LISTS +# define Q_COMPILER_AUTO_TYPE +# define Q_COMPILER_LAMBDA +//# define Q_COMPILER_VARIADIC_TEMPLATES +//# define Q_COMPILER_CLASS_ENUM +//# define Q_COMPILER_DEFAULT_DELETE_MEMBERS +//# define Q_COMPILER_UNICODE_STRINGS +//# define Q_COMPILER_EXTERN_TEMPLATES +# endif + + #elif defined(__BORLANDC__) || defined(__TURBOC__) # define Q_CC_BOR # define Q_INLINE_TEMPLATE |