Commit cfad538a authored by hjk's avatar hjk

Debugger: Fix attaching via app output pane

Task-number: QTCREATORBUG-18604
Change-Id: Id41f3fe1bf08965cfdaf21a7059fc2f1db49ecc7
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent a7ffd67a
......@@ -2119,6 +2119,7 @@ void DebuggerPlugin::attachExternalApplication(RunControl *rc)
rp.startMode = AttachExternal;
rp.closeMode = DetachAtClose;
rp.toolChainAbi = rc->abi();
rp.languages = CppLanguage;
if (RunConfiguration *runConfig = rc->runConfiguration()) {
auto runControl = new RunControl(runConfig, ProjectExplorer::Constants::DEBUG_RUN_MODE);
(void) new DebuggerRunTool(runControl, rp);
......
......@@ -359,16 +359,14 @@ static bool fixupParameters(DebuggerRunParameters &rp, RunControl *runControl, Q
}
}
DebuggerRunConfigurationAspect *debuggerAspect
= runConfig->extraAspect<DebuggerRunConfigurationAspect>();
if (debuggerAspect) {
if (auto debuggerAspect = runConfig->extraAspect<DebuggerRunConfigurationAspect>()) {
rp.multiProcess = debuggerAspect->useMultiProcess();
rp.languages = NoLanguage;
if (debuggerAspect->useCppDebugger())
rp.languages |= CppLanguage;
if (debuggerAspect->useQmlDebugger())
rp.languages |= QmlLanguage;
if (rp.languages == NoLanguage) {
if (debuggerAspect->useCppDebugger())
rp.languages |= CppLanguage;
if (debuggerAspect->useQmlDebugger())
rp.languages |= QmlLanguage;
}
}
// This can happen e.g. when started from the command line.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment