diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-05-02 09:59:36 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-05-03 09:57:21 -0700 |
| commit | 0735c72ef76492db60ad3b16fd3065e36e63e933 (patch) | |
| tree | c8c4eae93a66307b7e5f9bc8e9235f34a3661f9d /tests/postbuild | |
| parent | ea76e05eadbbf8ad7ab8300a744c60ca1b00da04 (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: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'tests/postbuild')
| -rw-r--r-- | tests/postbuild/bic/tst_bic.cpp | 8 | ||||
| -rw-r--r-- | tests/postbuild/symbols/tst_symbols.cpp | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/tests/postbuild/bic/tst_bic.cpp b/tests/postbuild/bic/tst_bic.cpp index 37d506d7..40aad19f 100644 --- a/tests/postbuild/bic/tst_bic.cpp +++ b/tests/postbuild/bic/tst_bic.cpp @@ -37,8 +37,8 @@ typedef QPair<int, int> Version; static QString compiler() { -#if defined(Q_CC_INTEL) - return QLatin1String("icc"); +#if defined(Q_CC_CLANG) && defined(__INTEL_CLANG_COMPILER) + return QLatin1String("icx"); #elif defined(Q_CC_CLANG) return QLatin1String("clang++"); #elif defined(Q_CC_GNU) @@ -124,7 +124,7 @@ static QString fileSuffix(const QString &compiler, const Version &compilerVersio Q_UNUSED(compiler); Q_UNUSED(compilerVersion); QString result; -#if !defined(Q_CC_GNU) || defined(Q_CC_INTEL) +#if !defined(Q_CC_GNU) return result; #endif @@ -556,7 +556,7 @@ QBic::Info tst_Bic::getCurrentInfo(const QString &libName) void tst_Bic::sizesAndVTables() { -#if !defined(Q_CC_GNU) || defined(Q_CC_INTEL) +#if !defined(Q_CC_GNU) QSKIP("Test not implemented for this compiler/platform"); #elif defined(QT_NO_PROCESS) QSKIP("This Qt build does not have QProcess support"); diff --git a/tests/postbuild/symbols/tst_symbols.cpp b/tests/postbuild/symbols/tst_symbols.cpp index 7d627f6f..113c98b5 100644 --- a/tests/postbuild/symbols/tst_symbols.cpp +++ b/tests/postbuild/symbols/tst_symbols.cpp @@ -481,9 +481,6 @@ void tst_Symbols::prefix() } } -#if defined(Q_CC_INTEL) - QEXPECT_FAIL("", "linux-icc* incorrectly exports some QtWebkit symbols, waiting for a fix from Intel.", Continue); -#endif QVERIFY2(!isFailed, "Libraries contain non-prefixed symbols. See Debug output above."); } #endif |