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

cdb: Be a bit more robust when detecting debuggin tools for win, 64 bit.

Browse Source 
It seems like some versions install with the postfix " 64-bit." The
change also makes it easier to add new postfixes.

Reviewed-by: owolff
This commit is contained in:
Daniel Molkentin
2009-06-12 15:11:28 +02:00
parent 7f0c0a5133
commit e8c4169866
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/debugger/cdb/cdboptions.cpp
View File

@@ -86,7 +86,11 @@ bool CdbOptions::autoDetectPath(QString *outPath, QStringList *checkedDirectorie
// Look for $ProgramFiles/"Debugging Tools For Windows <bit-idy>" and its
// " (x86)", " (x64)" variations. Qt Creator needs 64/32 bit depending
// on how it was built.
static const char *postFixes[] = { " (x86)", " (x32)", " (x64)" };
#ifdef Q_OS_WIN64
static const char *postFixes[] = {" (x64)", " 64-bit" };
#else
static const char *postFixes[] = { " (x86)", " (x32)" };
#endif
outPath->clear();
const QByteArray programDirB = qgetenv("ProgramFiles");
@@ -94,11 +98,7 @@ bool CdbOptions::autoDetectPath(QString *outPath, QStringList *checkedDirectorie
return false;
const QString programDir = QString::fromLocal8Bit(programDirB) + QDir::separator();
#ifdef Q_OS_WIN64
const QString installDir = QLatin1String("Debugging Tools For Windows (x64)");
#else
const QString installDir = QLatin1String("Debugging Tools For Windows");
#endif
QString path = programDir + installDir;
if (checkedDirectories)