diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-06-25 14:59:54 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-26 12:37:41 +0200 |
| commit | 440a227054fa9facfcf516e937daa9c593d59161 (patch) | |
| tree | fb0d73de4e5fa7519e85fd16ab17d4c8903181bf | |
| parent | 8f8c29b1c88545c8dee41743f50661885b5c1ec2 (diff) | |
Fix win32-icc build: _CHAR16T is not an indication of C++11 support
The macro comes from MSVC's yvals.h header and it actually indicates
absence of C++11 support in MSVC. It is defined if
_HAS_CHAR16_T_LANGUAGE_SUPPORT isn't defined, which is a C++11 feature.
Task-number: QTBUG-31701
Change-Id: I155b8e764f786e95a08de660f70094b2bee38937
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 548eebd3ad..b685c1fe0d 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -467,7 +467,7 @@ # if __INTEL_COMPILER < 1200 # define Q_NO_TEMPLATE_FRIENDS # endif -# if defined(_CHAR16T) || __cplusplus >= 201103L +# if __cplusplus >= 201103L # define Q_COMPILER_VARIADIC_MACROS # if __INTEL_COMPILER >= 1200 # define Q_COMPILER_AUTO_TYPE |