feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Prevent crash if kit has no toolchain

Browse Source 
Amends beb167a963.

(cherry picked from commit b3375cfd56)
Fixes: QTCREATORBUG-26777
Change-Id: I65feee771a21bdfbb2a102419a0d778af97a22eb
Reviewed-by: Christiaan Janssen <christiaan.janssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2022-01-21 08:23:13 +01:00
committed by Alessandro Portale
parent 0d17063e82
commit 2962da2255
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -807,7 +807,9 @@ static bool isDocker(const Kit *k)
static bool isWindowsARM64(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 return targetAbi.os() == Abi::WindowsOS && targetAbi.architecture() == Abi::ArmArchitecture
&& targetAbi.wordWidth() == 64; && targetAbi.wordWidth() == 64;
} }