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

Improved CDB autodetection.

Browse Source 
Check for x32 as well; pop up a message box on failure.
This commit is contained in:
Friedemann Kleint
2009-05-19 16:51:33 +02:00
parent 96ea23b9c6
commit 3cae726f79
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,11 +81,11 @@ void CdbOptions::toSettings(QSettings *s) const
s->endGroup();
}
bool CdbOptions::autoDetectPath(QString *outPath)
bool CdbOptions::autoDetectPath(QString *outPath, QStringList *checkedDirectories /* = 0 */)
{
// Look for $ProgramFiles/"Debugging Tools For Windows" and its
// :" (x86)", " (x64)" variations
static const char *postFixes[] = { " (x86)", " (x64)" };
static const char *postFixes[] = { " (x86)", " (x32)", " (x64)" };
outPath->clear();
const QByteArray programDirB = qgetenv("ProgramFiles");
@@ -95,6 +95,8 @@ bool CdbOptions::autoDetectPath(QString *outPath)
const QString programDir = QString::fromLocal8Bit(programDirB) + QDir::separator();
const QString installDir = QLatin1String("Debugging Tools For Windows");
QString path = programDir + installDir;
if (checkedDirectories)
checkedDirectories->push_back(path);
if (QFileInfo(path).isDir()) {
*outPath = QDir::toNativeSeparators(path);
return true;
@@ -103,6 +105,8 @@ bool CdbOptions::autoDetectPath(QString *outPath)
for (int i = 0; i < sizeof(postFixes)/sizeof(const char*); i++) {
path.truncate(rootLength);
path += QLatin1String(postFixes[i]);
if (checkedDirectories)
checkedDirectories->push_back(path);
if (QFileInfo(path).isDir()) {
*outPath = QDir::toNativeSeparators(path);
return true;