Commit 3ff03ea9 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Debugger: Fix CDB autodetection for 32bit builds on 64bit systems.

parent c11d657d
......@@ -242,11 +242,15 @@ bool CdbOptions::autoDetectExecutable(QString *outPath, bool *is64bitIn /* = 0
return true;
}
#else
*outPath = checkCdbExecutable(programDir + QLatin1String(" (x64)"), QString(), checkedDirectories);
if (!outPath->isEmpty()) {
if (is64bitIn)
*is64bitIn = true;
return true;
// A 32bit process on 64 bit sees "ProgramFiles\Debg.. (x64)"
if (programDir.endsWith(QLatin1String(" (x86)"))) {
*outPath = checkCdbExecutable(programDir.left(programDir.size() - 6),
QLatin1String(" (x64)"), checkedDirectories);
if (!outPath->isEmpty()) {
if (is64bitIn)
*is64bitIn = true;
return true;
}
}
#endif
return false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment