diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-05-02 09:47:15 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-05-11 12:50:08 -0700 |
| commit | 20104bb237d5231640649bcc610d4e51e03ea617 (patch) | |
| tree | c9587548c0ed9fa201556a9beaa00fb2370f753c /src/corelib/global/qnumeric.h | |
| parent | 5302857f5a716037aaef22143ea11102ad47bce0 (diff) | |
Remove remnants of the old Intel C++ compiler
We don't support it any more. I don't think it has ever properly
compiled Qt 6 (and it's no longer working for me against GCC 12's
libstdc++ headers). If you report a bug against it, Intel support's
first question is if you can try instead the new Clang/LLVM-based oneAPI
C++ compiler.
So we support only that one, which identifies itself as Q_CC_CLANG.
Change-Id: I5ff8e16fcdcb4ffd9ab6fffd16eb57a092c8439e
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/corelib/global/qnumeric.h')
| -rw-r--r-- | src/corelib/global/qnumeric.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/global/qnumeric.h b/src/corelib/global/qnumeric.h index a40c95b637..d625b11a50 100644 --- a/src/corelib/global/qnumeric.h +++ b/src/corelib/global/qnumeric.h @@ -114,11 +114,9 @@ Q_CORE_EXPORT quint64 qFloatDistance(double a, double b); // size_t. Implementations for 8- and 16-bit types will work but may not be as // efficient. Implementations for 64-bit may be missing on 32-bit platforms. -#if (((defined(Q_CC_INTEL) ? (Q_CC_INTEL >= 1800 && !defined(Q_OS_WIN)) : defined(Q_CC_GNU)) \ - && Q_CC_GNU >= 500) \ - || __has_builtin(__builtin_add_overflow)) \ +#if (Q_CC_GNU >= 500 || __has_builtin(__builtin_add_overflow)) \ && !(QT_POINTER_SIZE == 4 && defined(Q_CC_CLANG)) -// GCC 5, ICC 18, and Clang 3.8 have builtins to detect overflows +// GCC 5 and Clang 3.8 have builtins to detect overflows // 32 bit Clang has the builtins but tries to link a library which hasn't #define Q_INTRINSIC_MUL_OVERFLOW64 |