From 99357e32a0e29c73ed721d6d31da66635e6586ca Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 18 Dec 2014 14:52:04 -0800 Subject: [PATCH] Fix detection of C++11 Unicode strings with icl.exe Even though the compiler supports it, the MSVC headers might do something wrong and make compilation fail later due to attempting to overload unsigned short with char16_t. The _CHAR16_T definition comes from , so include that instead of in C++ mode. Change-Id: Ifaeb1c92bde2db4ed4129507462391904afd6510 Reviewed-by: Olivier Goffart --- src/corelib/global/qcompilerdetection.h | 6 ++++-- src/corelib/global/qglobal.h | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 3a6f02db17f..db5f6f3bb1c 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -499,7 +499,7 @@ // at least since 13.1, but I can't test further back # define Q_COMPILER_BINARY_LITERALS # endif -# if __cplusplus >= 201103L +# if __cplusplus >= 201103L || defined(__INTEL_CXX11_MODE__) # if __INTEL_COMPILER >= 1200 # define Q_COMPILER_AUTO_TYPE # define Q_COMPILER_CLASS_ENUM @@ -517,7 +517,9 @@ # define Q_COMPILER_AUTO_FUNCTION # define Q_COMPILER_NULLPTR # define Q_COMPILER_TEMPLATE_ALIAS -# define Q_COMPILER_UNICODE_STRINGS +# ifndef _CHAR16T // MSVC headers +# define Q_COMPILER_UNICODE_STRINGS +# endif # define Q_COMPILER_VARIADIC_TEMPLATES # endif # if __INTEL_COMPILER >= 1300 diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 19e368defc4..e93bfbcc4a0 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -35,7 +35,11 @@ #ifndef QGLOBAL_H #define QGLOBAL_H -#include +#ifdef __cplusplus +# include +#else +# include +#endif #define QT_VERSION_STR "5.5.0" /*