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

Debugger: Don't re-evaluate language choices

Browse Source 
Change-Id: Idca373abbca7c381bdb0af9c0db6763285700ed8
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2016-03-22 15:22:34 +01:00
parent e4de466cdd
commit bc95eaaa23
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -515,13 +515,10 @@ void DebuggerRunControlCreator::enrich(const RunConfiguration *runConfig, const
}
}
if (m_rp.masterEngineType == NoEngineType && m_debuggerAspect) {
const bool wantCppDebugger = m_debuggerAspect->useCppDebugger() && (m_rp.languages & CppLanguage);
const bool wantQmlDebugger = m_debuggerAspect->useQmlDebugger() && (m_rp.languages & QmlLanguage);
if (wantQmlDebugger) {
if (m_rp.masterEngineType == NoEngineType) {
if (m_rp.languages & QmlLanguage) {
QmlDebug::QmlDebugServicesPreset service;
if (wantCppDebugger) {
if (m_rp.languages & CppLanguage) {
if (m_rp.nativeMixedEnabled) {
service = QmlDebug::QmlNativeDebuggerServices;
} else {
@@ -534,7 +531,7 @@ void DebuggerRunControlCreator::enrich(const RunConfiguration *runConfig, const
}
if (m_rp.startMode != AttachExternal)
QtcProcess::addArg(&m_rp.inferior.commandLineArguments,
wantCppDebugger && m_rp.nativeMixedEnabled ?
(m_rp.languages & CppLanguage) && m_rp.nativeMixedEnabled ?
QmlDebug::qmlDebugNativeArguments(service, false) :
QmlDebug::qmlDebugTcpArguments(service, m_rp.qmlServerPort));
}