Commit e785831d authored by Friedemann Kleint's avatar Friedemann Kleint

Debugger[CDB]: Detect 64bit Debugging tools in 32bit executables.

Current version fails on some setups, check all postfixes.

Task-number: QTCREATORBUG-4213
parent 9b9f19dd
...@@ -747,13 +747,14 @@ QString MsvcToolChain::autoDetectCdbDebugger(QStringList *checkedDirectories /* ...@@ -747,13 +747,14 @@ QString MsvcToolChain::autoDetectCdbDebugger(QStringList *checkedDirectories /*
if (!outPath.isEmpty()) if (!outPath.isEmpty())
return QString(); return QString();
#else #else
// A 32bit process on 64 bit sees "ProgramFiles\Debg.. (x64)" // A 32bit process on 64 bit sees "ProgramFiles\Debg.. (x64)".
if (programDir.endsWith(QLatin1String(" (x86)"))) { if (programDir.endsWith(QLatin1String(" (x86)"))) {
outPath = checkCdbExecutable(programDir.left(programDir.size() - 6), const QString programDir64 = programDir.left(programDir.size() - 6);
QLatin1String(" (x64)"), checkedDirectories); for (unsigned i = 0; i < sizeof(postFixes)/sizeof(const char*); i++) {
outPath = checkCdbExecutable(programDir64, QLatin1String(postFixes[i]), checkedDirectories);
if (!outPath.isEmpty()) if (!outPath.isEmpty())
return QString(); return outPath;
}
} }
#endif #endif
return QString(); return QString();
......
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