From 1e34d6ee2218a74c1f7be8f903bcd0a0101755b7 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 3 Feb 2022 12:08:36 +0100
Subject: [PATCH] Debugger: Fix autodetection

Fixes: QTCREATORBUG-26978
Change-Id: I32585251d47729f7fde9ee6e707d9e9cfed4c1a7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/debugger/debuggeritemmanager.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp
index 93b91c55591..8b3a31d2d5b 100644
--- a/src/plugins/debugger/debuggeritemmanager.cpp
+++ b/src/plugins/debugger/debuggeritemmanager.cpp
@@ -32,6 +32,7 @@
 
 #include <extensionsystem/pluginmanager.h>
 
+#include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectexplorericons.h>
 
@@ -957,8 +958,10 @@ void DebuggerItemManagerPrivate::restoreDebuggers()
     readDebuggers(userSettingsFileName(), false);
 
     // Auto detect current.
+    IDevice::ConstPtr desktop = DeviceManager::defaultDesktopDevice();
+    QTC_ASSERT(desktop, return);
+    autoDetectGdbOrLldbDebuggers(desktop->systemEnvironment().path(), {});
     autoDetectCdbDebuggers();
-    autoDetectGdbOrLldbDebuggers({}, {});
     autoDetectUvscDebuggers();
 }