AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move enabling of C++11 Unicode Strings with ICC from 12.1 to 14.0

Browse Source 
The support in 12.1 and 13.x appears to be incomplete. Move it to the
official supported version

https://software.intel.com/en-us/articles/c0x-features-supported-by-intel-c-compiler

Note: this commit will cause a conflict in 5.5 against
99357e32a0

Task-number: QTBUG-43864
Change-Id: Ic5d393bfd36e48a193fcffff13b9a07106e96795
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Thiago Macieira 2015-01-15 09:39:24 -08:00
parent 9d1bcd727a
commit be5b04fd37
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qcompilerdetection.h
View File

@ -533,7 +533,6 @@
# define Q_COMPILER_AUTO_FUNCTION # define Q_COMPILER_AUTO_FUNCTION
# define Q_COMPILER_NULLPTR # define Q_COMPILER_NULLPTR
# define Q_COMPILER_TEMPLATE_ALIAS # define Q_COMPILER_TEMPLATE_ALIAS
# define Q_COMPILER_UNICODE_STRINGS
# define Q_COMPILER_VARIADIC_TEMPLATES # define Q_COMPILER_VARIADIC_TEMPLATES
# endif # endif
# if __INTEL_COMPILER >= 1300 # if __INTEL_COMPILER >= 1300
@ -554,6 +553,7 @@
# define Q_COMPILER_RANGE_FOR # define Q_COMPILER_RANGE_FOR
# define Q_COMPILER_RAW_STRINGS # define Q_COMPILER_RAW_STRINGS
# define Q_COMPILER_REF_QUALIFIERS # define Q_COMPILER_REF_QUALIFIERS
# define Q_COMPILER_UNICODE_STRINGS
# define Q_COMPILER_UNRESTRICTED_UNIONS # define Q_COMPILER_UNRESTRICTED_UNIONS
# endif # endif
# if __INTEL_COMPILER >= 1500 # if __INTEL_COMPILER >= 1500