diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index d2e068ad430..353b35d79bb 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -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(); - 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(); + 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; } }