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

Debugger: Startup fix after 807c3a5ad2

Browse Source 
Change-Id: I731a2916ba7580caaaeea6a7de72e748c30f31f1
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
hjk
2015-02-10 16:17:57 +01:00
parent bf6aa3cc2b
commit b8ec2d8e73
1 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -401,33 +401,32 @@ DebuggerRunControl *DebuggerRunControlFactory::doCreate
}
}
if (sp.masterEngineType == NoEngineType)
return 0;
if (sp.executable.endsWith(_(".py"))) {
sp.masterEngineType = PdbEngineType;
} else {
if (RunConfiguration *rc = sp.runConfiguration) {
DebuggerRunConfigurationAspect *aspect
= rc->extraAspect<Debugger::DebuggerRunConfigurationAspect>();
if (const Target *target = rc->target())
if (!DebuggerRunControlFactory::fillParametersFromKit(&sp, target->kit(), errorMessage))
return 0;
const bool useCppDebugger = aspect->useCppDebugger() && (sp.languages & CppLanguage);
const bool useQmlDebugger = aspect->useQmlDebugger() && (sp.languages & QmlLanguage);
if (useQmlDebugger) {
if (useCppDebugger) {
sp.masterEngineType = QmlCppEngineType;
sp.firstSlaveEngineType = sp.cppEngineType;
sp.secondSlaveEngineType = QmlCppEngineType;
if (sp.masterEngineType == NoEngineType) {
if (sp.executable.endsWith(_(".py"))) {
sp.masterEngineType = PdbEngineType;
} else {
if (RunConfiguration *rc = sp.runConfiguration) {
DebuggerRunConfigurationAspect *aspect
= rc->extraAspect<Debugger::DebuggerRunConfigurationAspect>();
if (const Target *target = rc->target())
if (!DebuggerRunControlFactory::fillParametersFromKit(&sp, target->kit(), errorMessage))
return 0;
const bool useCppDebugger = aspect->useCppDebugger() && (sp.languages & CppLanguage);
const bool useQmlDebugger = aspect->useQmlDebugger() && (sp.languages & QmlLanguage);
if (useQmlDebugger) {
if (useCppDebugger) {
sp.masterEngineType = QmlCppEngineType;
sp.firstSlaveEngineType = sp.cppEngineType;
sp.secondSlaveEngineType = QmlCppEngineType;
} else {
sp.masterEngineType = QmlEngineType;
}
} else {
sp.masterEngineType = QmlEngineType;
sp.masterEngineType = sp.cppEngineType;
}
} else {
sp.masterEngineType = sp.cppEngineType;
}
} else {
sp.masterEngineType = sp.cppEngineType;
}
}