1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Detect clang-cl features as clang not as msvc

Browse Source 
Clang-cl supports the clang detections, and only approximates specific
MSVC version.

This works as the MSVC standard library is ahead of the clang standard
library. Where this logic was written 7 years ago when it was not the
case.

Pick-to: 6.3
Change-Id: Ic13e2f2fbcde011a0d8831cc48c0c9041bfe3b99
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Allan Sandfeld Jensen 2022-02-01 11:14:57 +01:00
parent e400ba64a3
commit a300c3810c
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -626,7 +626,7 @@
# endif # endif
#endif #endif
#if defined(Q_CC_CLANG) && !defined(Q_CC_INTEL) && !defined(Q_CC_MSVC) #if defined(Q_CC_CLANG) && !defined(Q_CC_INTEL)
/* General C++ features */ /* General C++ features */
# define Q_COMPILER_RESTRICTED_VLA # define Q_COMPILER_RESTRICTED_VLA
# if __has_feature(attribute_deprecated_with_message) # if __has_feature(attribute_deprecated_with_message)
@ -785,14 +785,11 @@
# endif # endif
# endif # endif
#endif // Q_CC_CLANG && !Q_CC_INTEL && !Q_CC_MSVC
#if defined(Q_CC_CLANG) && !defined(Q_CC_INTEL)
# ifndef Q_DECL_UNUSED # ifndef Q_DECL_UNUSED
# define Q_DECL_UNUSED __attribute__((__unused__)) # define Q_DECL_UNUSED __attribute__((__unused__))
# endif # endif
# define Q_DECL_UNUSED_MEMBER Q_DECL_UNUSED # define Q_DECL_UNUSED_MEMBER Q_DECL_UNUSED
#endif #endif // defined(Q_CC_CLANG) && !defined(Q_CC_INTEL)
#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG) #if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG)
# define Q_COMPILER_RESTRICTED_VLA # define Q_COMPILER_RESTRICTED_VLA
@ -897,7 +894,7 @@
# endif # endif
#endif #endif
#if defined(Q_CC_MSVC) #if defined(Q_CC_MSVC) && !defined(Q_CC_CLANG)
# if defined(__cplusplus) # if defined(__cplusplus)
/* C++11 features supported in VC8 = VC2005: */ /* C++11 features supported in VC8 = VC2005: */
# define Q_COMPILER_VARIADIC_MACROS # define Q_COMPILER_VARIADIC_MACROS
@ -955,7 +952,7 @@
# define Q_COMPILER_CONSTEXPR # define Q_COMPILER_CONSTEXPR
# endif # endif
# endif /* __cplusplus */ # endif /* __cplusplus */
#endif /* Q_CC_MSVC */ #endif // defined(Q_CC_MSVC) && !defined(Q_CC_CLANG)
#ifdef Q_COMPILER_UNICODE_STRINGS #ifdef Q_COMPILER_UNICODE_STRINGS
# define Q_STDLIB_UNICODE_STRINGS # define Q_STDLIB_UNICODE_STRINGS