From 2f8e962f837b02fd1b3809aa82ed0ef5b07b9429 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 28 Nov 2022 16:31:31 +0100
Subject: [PATCH] Debugger: Do not force cdb when no toolchain is configured

... in the kit settings widget.

Fixes: QTCREATORBUG-28458
Change-Id: I75907bfeeff56173fb9d92045345ba0ca15584b4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/debugger/debuggerkitinformation.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp
index c05d96b1db2..a0f46fa86a5 100644
--- a/src/plugins/debugger/debuggerkitinformation.cpp
+++ b/src/plugins/debugger/debuggerkitinformation.cpp
@@ -249,8 +249,18 @@ void DebuggerKitAspect::fix(Kit *k)
             setup(k);
             return;
         }
-        const Abi tcAbi = ToolChainKitAspect::targetAbi(k);
-        if (item->matchTarget(tcAbi) != DebuggerItem::DoesNotMatch)
+
+        Abi kitAbi;
+        if (ToolChainKitAspect::toolChains(k).isEmpty()) {
+            if (DeviceTypeKitAspect::deviceTypeId(k)
+                    != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
+                return;
+            }
+            kitAbi = Abi(Abi::UnknownArchitecture, Abi::hostAbi().os());
+        } else {
+            kitAbi = ToolChainKitAspect::targetAbi(k);
+        }
+        if (item->matchTarget(kitAbi) != DebuggerItem::DoesNotMatch)
             return;
         k->setValue(DebuggerKitAspect::id(), QVariant());
         setup(k);