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/qglobal.cpp | |
| 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/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index e184954cb2..1f9ac131d4 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1728,9 +1728,13 @@ bool qSharedBuild() noexcept /*! \macro Q_CC_INTEL \relates <QtGlobal> + \obsolete - Defined if the application is compiled using Intel C++ for Linux, - Intel C++ for Windows. + This macro used to be defined if the application was compiled with the old + Intel C++ compiler for Linux, macOS or Windows. The new oneAPI C++ compiler + is just a build of Clang and therefore does not define this macro. + + \sa Q_CC_CLANG */ /*! @@ -3382,7 +3386,7 @@ void qAbort() // [support.start.term]). So we bypass std::abort() and directly // terminate the application. -# if defined(Q_CC_MSVC) && !defined(Q_CC_INTEL) +# if defined(Q_CC_MSVC) if (IsProcessorFeaturePresent(PF_FASTFAIL_AVAILABLE)) __fastfail(FAST_FAIL_FATAL_APP_EXIT); # else |