From 21ed15fcc930738116f26ab4c230702e319df7af Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Mon, 23 May 2022 18:13:59 +0200 Subject: [PATCH] Debugger: Add auto-detection for arm64 version of cdb.exe This would allow native debugging on Windows Arm64. Change-Id: I77dd479606335bab9f7c7ae27889f056d4ea57f4 Reviewed-by: Reviewed-by: David Schulz --- src/plugins/debugger/debuggeritemmanager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index d2346f7215c..9efc8df4a25 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -669,12 +669,12 @@ void DebuggerItemManagerPrivate::autoDetectCdbDebuggers() for (const QFileInfo &kitFolderFi : kitFolders) { const QString path = kitFolderFi.absoluteFilePath(); - const QFileInfo cdb32(path + "/Debuggers/x86/cdb.exe"); - if (cdb32.isExecutable()) - cdbs.append(FilePath::fromString(cdb32.absoluteFilePath())); - const QFileInfo cdb64(path + "/Debuggers/x64/cdb.exe"); - if (cdb64.isExecutable()) - cdbs.append(FilePath::fromString(cdb64.absoluteFilePath())); + const QStringList abis = {"x86", "x64", "arm64"}; + for (const QString &abi: abis) { + const QFileInfo cdbBinary(path + "/Debuggers/" + abi + "/cdb.exe"); + if (cdbBinary.isExecutable()) + cdbs.append(FilePath::fromString(cdbBinary.absoluteFilePath())); + } } for (const FilePath &cdb : qAsConst(cdbs)) {