Debugger: Fix attaching via app output pane

Task-number: QTCREATORBUG-18604
Change-Id: Id41f3fe1bf08965cfdaf21a7059fc2f1db49ecc7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-08-09 18:25:22 +02:00
parent a7ffd67a91
commit cfad538acf
2 changed files with 8 additions and 9 deletions

View File

@@ -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.