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/text | |
| 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/text')
| -rw-r--r-- | src/corelib/text/qanystringview.h | 2 | ||||
| -rw-r--r-- | src/corelib/text/qstring.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/text/qstringview.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/text/qanystringview.h b/src/corelib/text/qanystringview.h index 102a5b63ae..65b74c4664 100644 --- a/src/corelib/text/qanystringview.h +++ b/src/corelib/text/qanystringview.h @@ -123,7 +123,7 @@ private: template <typename Char> static qsizetype lengthHelperPointer(const Char *str) noexcept { -#if defined(Q_CC_GNU) && !defined(Q_CC_CLANG) && !defined(Q_CC_INTEL) +#if defined(Q_CC_GNU) && !defined(Q_CC_CLANG) if (__builtin_constant_p(*str)) { qsizetype result = 0; while (*str++ != u'\0') diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index acf02832da..00e12fe35d 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -360,7 +360,7 @@ extern "C" void qt_fromlatin1_mips_asm_unroll8 (char16_t*, const char*, uint); extern "C" void qt_toLatin1_mips_dsp_asm(uchar *dst, const char16_t *src, int length); #endif -#if defined(__SSE2__) && defined(Q_CC_GNU) && !defined(Q_CC_INTEL) +#if defined(__SSE2__) && defined(Q_CC_GNU) # if defined(__SANITIZE_ADDRESS__) && Q_CC_GNU < 800 && !defined(Q_CC_CLANG) # warning "The __attribute__ on below will likely cause a build failure with your GCC version. Your choices are:" # warning "1) disable ASan;" diff --git a/src/corelib/text/qstringview.h b/src/corelib/text/qstringview.h index 194a8280c9..3c1f852c27 100644 --- a/src/corelib/text/qstringview.h +++ b/src/corelib/text/qstringview.h @@ -154,7 +154,7 @@ private: #if defined(__cpp_lib_is_constant_evaluated) if (std::is_constant_evaluated()) return std::char_traits<Char>::length(str); -#elif defined(Q_CC_GNU) && !defined(Q_CC_CLANG) && !defined(Q_CC_INTEL) +#elif defined(Q_CC_GNU) && !defined(Q_CC_CLANG) if (__builtin_constant_p(*str)) return std::char_traits<Char>::length(str); #endif |