summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2022-01-21 08:23:13 +0100
committerAlessandro Portale <alessandro.portale@qt.io>2022-02-08 18:01:19 +0000
commit2962da2255a1c0528e9b0d55d2cc8bf192991f52 (patch)
tree967d829c182c5385c1bd16016b53296b90d7cb43
parent0d17063e826b137ea00d40c01eca2924e895b8fd (diff)
downloadqt-creator-2962da2255a1c0528e9b0d55d2cc8bf192991f52.tar.gz
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 <christiaan.janssen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 6f74bc9126..c34c666057 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;
}