forked from qt-creator/qt-creator
Debugger: Fix CDB autodetection for 32bit builds on 64bit systems.
This commit is contained in:
@@ -242,12 +242,16 @@ bool CdbOptions::autoDetectExecutable(QString *outPath, bool *is64bitIn /* = 0
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
*outPath = checkCdbExecutable(programDir + QLatin1String(" (x64)"), QString(), checkedDirectories);
|
// 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 (!outPath->isEmpty()) {
|
||||||
if (is64bitIn)
|
if (is64bitIn)
|
||||||
*is64bitIn = true;
|
*is64bitIn = true;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user