diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-12 13:39:37 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-13 12:49:49 -0700 |
commit | cb0ea3989598a83b2326f63e7da1669018a965e5 (patch) | |
tree | 7c2a85ef1ad971e2e653b986457117bf95e25c55 /tests/auto/tools | |
parent | 63d80c7c4b23b5802f1f20e6b322ccf4cdff5b12 (diff) |
CMake: remove support for building Qt with the old Intel compiler
This hasn't worked for some time. It's not in our CI and I don't think
it was working at all. When I tried to build it, I ran into several
problems with C++17 and an Internal Compiler Error I did not have any
interest in working around.
After discussing with the Intel compiler team, it was decided that
fixing those issues in the old compiler is not going to happen. Instead,
their recommendation is to adopt the new LLVM-based compiler, which
the last commit added support for.
This commit does not remove qmake support for the old ICC. It's possible
someone is using qmake with a non-Qt6 project and ICC.
Change-Id: Icb2516126f674e7b8bb3fffd16ad6350ddbd49e5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/tools')
-rw-r--r-- | tests/auto/tools/moc/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/tools/moc/CMakeLists.txt b/tests/auto/tools/moc/CMakeLists.txt index 228af5992e..44c9ee3fa9 100644 --- a/tests/auto/tools/moc/CMakeLists.txt +++ b/tests/auto/tools/moc/CMakeLists.txt @@ -85,11 +85,11 @@ qt_internal_extend_target(tst_moc CONDITION CMAKE_CROSSCOMPILING MOC_CROSS_COMPILED ) -if (UNIX AND (CLANG OR GCC OR ICC OR QCC)) +if (UNIX AND (CLANG OR GCC OR QCC)) qt_wrap_cpp(os9_moc os9-newlines.h) endif() -qt_internal_extend_target(tst_moc CONDITION UNIX AND (CLANG OR GCC OR ICC OR QCC) +qt_internal_extend_target(tst_moc CONDITION UNIX AND (CLANG OR GCC OR QCC) SOURCES os9-newlines.h win-newlines.h |