From 2962da2255a1c0528e9b0d55d2cc8bf192991f52 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 21 Jan 2022 08:23:13 +0100 Subject: CMake: Prevent crash if kit has no toolchain Amends beb167a963. (cherry picked from commit b3375cfd560b7fb9449ac127cc0aeb6530a3dd1d) Fixes: QTCREATORBUG-26777 Change-Id: I65feee771a21bdfbb2a102419a0d778af97a22eb Reviewed-by: Christiaan Janssen Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 6f74bc9126e..c34c6660570 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -807,7 +807,9 @@ static bool isDocker(const Kit *k) static bool isWindowsARM64(const Kit *k) { - const auto targetAbi = ToolChainKitAspect::cxxToolChain(k)->targetAbi(); + ToolChain *toolchain = ToolChainKitAspect::cxxToolChain(k); + QTC_ASSERT(toolchain, return false); + const Abi targetAbi = toolchain->targetAbi(); return targetAbi.os() == Abi::WindowsOS && targetAbi.architecture() == Abi::ArmArchitecture && targetAbi.wordWidth() == 64; } -- cgit v1.2.3