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

Debugger: Use arm64 cdb only on Arm64 host

Browse Source 
Otherwise on x86/x64 there will be a machine type mismatch warning
displayed.

Amends 21ed15fcc9

Change-Id: I7faee1a6f9eaa7abdabcd92a26de763b27a0e085
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Cristian Adam
2022-05-30 10:49:07 +02:00
parent faa9ddbcfd
commit ea47190ed6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debuggeritemmanager.cpp
View File

@@ -669,7 +669,9 @@ void DebuggerItemManagerPrivate::autoDetectCdbDebuggers()
for (const QFileInfo &kitFolderFi : kitFolders) { for (const QFileInfo &kitFolderFi : kitFolders) {
const QString path = kitFolderFi.absoluteFilePath(); const QString path = kitFolderFi.absoluteFilePath();
const QStringList abis = {"x86", "x64", "arm64"}; QStringList abis = {"x86", "x64"};
if (HostOsInfo::hostArchitecture() == HostOsInfo::HostArchitectureArm)
abis << "arm64";
for (const QString &abi: abis) { for (const QString &abi: abis) {
const QFileInfo cdbBinary(path + "/Debuggers/" + abi + "/cdb.exe"); const QFileInfo cdbBinary(path + "/Debuggers/" + abi + "/cdb.exe");
if (cdbBinary.isExecutable()) if (cdbBinary.isExecutable())