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

Improved CDB settings dialog, adapted autodetection to 64bit.

Browse Source 
Use correct path, display download link and notify that
settings take effect at next restart.
Acked-by: Daniel Molkentin <daniel.molkentin@nokia.com>
This commit is contained in:
Friedemann Kleint
2009-05-20 11:48:31 +02:00
parent bcaa2556f4
commit 3f19a0504e
5 changed files with 79 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,8 +83,9 @@ void CdbOptions::toSettings(QSettings *s) const
bool CdbOptions::autoDetectPath(QString *outPath, QStringList *checkedDirectories /* = 0 */)
{
// Look for $ProgramFiles/"Debugging Tools For Windows" and its
// :" (x86)", " (x64)" variations
// 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)" };
outPath->clear();
@@ -93,7 +94,12 @@ 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)
checkedDirectories->push_back(path);