Commit 83fa3ce3 authored by hjk's avatar hjk
Browse files

debugger: don't display slave data

parent 9912d37f
...@@ -115,19 +115,8 @@ void QmlCppEngine::setActiveEngine(DebuggerLanguage language) ...@@ -115,19 +115,8 @@ void QmlCppEngine::setActiveEngine(DebuggerLanguage language)
d->m_activeEngine = d->m_qmlEngine; d->m_activeEngine = d->m_qmlEngine;
updateEngine = true; updateEngine = true;
} }
if (previousEngine != d->m_activeEngine) { if (previousEngine != d->m_activeEngine)
showStatusMessage(tr("%1 debugger activated").arg(engineName)); showStatusMessage(tr("%1 debugger activated").arg(engineName));
debuggerCore()->displayDebugger(d->m_activeEngine, updateEngine);
}
}
DebuggerLanguage QmlCppEngine::activeEngine() const
{
if (d->m_activeEngine == d->m_cppEngine)
return CppLanguage;
if (d->m_activeEngine == d->m_qmlEngine)
return QmlLanguage;
return AnyLanguage;
} }
void QmlCppEngine::setToolTipExpression(const QPoint & mousePos, void QmlCppEngine::setToolTipExpression(const QPoint & mousePos,
...@@ -571,7 +560,7 @@ void QmlCppEngine::engineStateChanged(const DebuggerState &newState) ...@@ -571,7 +560,7 @@ void QmlCppEngine::engineStateChanged(const DebuggerState &newState)
break; break;
case InferiorShutdownRequested: case InferiorShutdownRequested:
if (activeEngine() == QmlLanguage) { if (d->m_activeEngine == d->m_qmlEngine) {
setActiveEngine(CppLanguage); setActiveEngine(CppLanguage);
} }
break; break;
......
...@@ -21,7 +21,6 @@ public: ...@@ -21,7 +21,6 @@ public:
explicit QmlCppEngine(const DebuggerStartParameters &sp); explicit QmlCppEngine(const DebuggerStartParameters &sp);
virtual ~QmlCppEngine(); virtual ~QmlCppEngine();
DebuggerLanguage activeEngine() const;
void setActiveEngine(DebuggerLanguage language); void setActiveEngine(DebuggerLanguage language);
virtual void setToolTipExpression(const QPoint &mousePos, virtual void setToolTipExpression(const QPoint &mousePos,
......
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