diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-12-08 16:22:56 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-12-09 07:00:02 +0100 |
| commit | f6cbb1ae70d6edf10d3b583dde861b97bb9b9389 (patch) | |
| tree | 74b631d23973747f5fa5b488d78e5b23dc9b5b27 /src/corelib/global | |
| parent | 4f53c703e40bea3203259c212c54dc4816c08b09 (diff) | |
Re-enable parsing Qt code with LLVM (Qt for Python)
Exclude the check introduced by 0dc6cc055174a0556f2e41ca269013b3a7056c86
for clang compilers since there seems to be no equivalent option
-permissive- for the MSVC emulation.
Change-Id: I0468d8e2f2c988e604be6960f1b1f4760ea0c400
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 25002efdca..0ec3bbcb85 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -97,7 +97,7 @@ # endif #endif // __cplusplus -#if defined(__cplusplus) && defined(Q_CC_MSVC) +#if defined(__cplusplus) && defined(Q_CC_MSVC) && !defined(Q_CC_CLANG) // On MSVC we require /permissive- set by user code. Check that we are // under its rules -- for instance, check that std::nullptr_t->bool is // not an implicit conversion, as per |