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

Debugger: Add new CDB-engine.

Browse Source 
Rubber-stamped-by: hjk
This commit is contained in:
Friedemann Kleint
2010-11-18 13:51:15 +01:00
parent 9c0eacf800
commit 8477c7bc4f
15 changed files with 3284 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/debugger/debuggerrunner.cpp
View File

@@ -95,6 +95,10 @@ bool checkCdbConfiguration(int, QString *, QString *) { return false; }
#endif
} // namespace Internal
namespace Cdb {
DebuggerEngine *createCdbEngine(const DebuggerStartParameters &, QString *errorMessage);
bool isCdbEngineEnabled(); // Check the configuration page
}
static QString toolChainName(int toolChainType)
{
@@ -261,7 +265,7 @@ unsigned DebuggerRunnerPrivate::enabledEngines() const
{
unsigned rc = m_cmdLineEnabledEngines;
#ifdef CDB_ENABLED
if (!Internal::isCdbEngineEnabled())
if (!Internal::isCdbEngineEnabled() && !Cdb::isCdbEngineEnabled())
rc &= ~CdbEngineType;
#endif
return rc;
@@ -464,7 +468,12 @@ void DebuggerRunControl::createEngine(const DebuggerStartParameters &startParams
d->m_engine = Internal::createScriptEngine(sp);
break;
case CdbEngineType:
d->m_engine = Internal::createCdbEngine(sp, &d->m_errorMessage);
// Try new engine, fall back to old.
if (Debugger::Cdb::isCdbEngineEnabled()) {
d->m_engine = Debugger::Cdb::createCdbEngine(sp, &d->m_errorMessage);
} else {
d->m_engine = Debugger::Internal::createCdbEngine(sp, &d->m_errorMessage);
}
break;
case PdbEngineType:
d->m_engine = Internal::createPdbEngine(sp);