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

Debugger: Improve engine detection.

Browse Source 
Remove the RunConfiguration parameter from guessCppEngineType()
and use the DebuggerStartParameter::toolChainAbi only.

Use fillParameter() to set the debugger command and toolchain
in order to prevent mismatches.

Add logic trying to figure out the profile to fillParameters()
in case the profile passed in is 0 for the command line cases.

Use CDB matcher for post mortem and Remote CDB, fix it to
prefer 64bit CDB on 64bit OS.

Change-Id: Icedc3883fe15660303060498ab609957e6d01cd1
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2012-08-23 15:23:37 +02:00
committed by hjk
parent fd8de2f48d
commit 78aa94c8c6
3 changed files with 127 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -578,17 +578,12 @@ static DebuggerEngineType guessCppEngineTypeForAbi(const DebuggerStartParameters
return NoEngineType;
}
static DebuggerEngineType guessCppEngineType(const DebuggerStartParameters &sp, RunConfiguration *rc)
static DebuggerEngineType guessCppEngineType(const DebuggerStartParameters &sp)
{
if (rc) {
if (Target *target = rc->target()) {
Profile *profile = target->profile();
if (ToolChain *tc = ToolChainProfileInformation::toolChain(profile)) {
DebuggerEngineType et = guessCppEngineTypeForAbi(sp, tc->targetAbi());
if (et != NoEngineType)
return et;
}
}
if (sp.toolChainAbi.isValid()) {
const DebuggerEngineType et = guessCppEngineTypeForAbi(sp, sp.toolChainAbi);
if (et != NoEngineType)
return et;
}
#ifdef Q_OS_WIN
@@ -628,23 +623,24 @@ static void fixupEngineTypes(DebuggerStartParameters &sp, RunConfiguration *rc)
if (rc) {
DebuggerRunConfigurationAspect *aspect = rc->debuggerAspect();
bool useCppDebugger = aspect->useCppDebugger();
bool useQmlDebugger = aspect->useQmlDebugger();
if (const Target *target = rc->target())
fillParameters(&sp, target->profile());
const bool useCppDebugger = aspect->useCppDebugger();
const bool useQmlDebugger = aspect->useQmlDebugger();
if (useQmlDebugger) {
if (useCppDebugger) {
sp.masterEngineType = QmlCppEngineType;
sp.firstSlaveEngineType = guessCppEngineType(sp, rc);
sp.firstSlaveEngineType = guessCppEngineType(sp);
sp.secondSlaveEngineType = QmlCppEngineType;
} else {
sp.masterEngineType = QmlEngineType;
}
} else {
sp.masterEngineType = guessCppEngineType(sp, rc);
sp.masterEngineType = guessCppEngineType(sp);
}
return;
}
sp.masterEngineType = guessCppEngineType(sp, rc);
sp.masterEngineType = guessCppEngineType(sp);
}
DebuggerRunControl *DebuggerRunControlFactory::doCreate