From 95d8ed71db67e744239cf4a9ca01f0af692edcc2 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 3 Mar 2016 10:06:18 +0200 Subject: [PATCH] Debugger: Re-add language-dependent context Lost in f3bd7412ef510c77a5e811d8ef85f371f0b67735. Change-Id: I6091db212eff8a4ac15c67e99d9e88fab5b11647 Reviewed-by: hjk --- src/plugins/debugger/debuggerplugin.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index a83014c2a9c..e8dbfef5073 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -3338,10 +3338,17 @@ void DebuggerPluginPrivate::updateUiForRunConfiguration(RunConfiguration *rc) void DebuggerPluginPrivate::updateActiveLanguages() { -// DebuggerLanguages languages = dd->m_currentEngine->runParameters().languages; + const DebuggerLanguages languages = dd->m_currentEngine->runParameters().languages; // Id perspective = (languages & QmlLanguage) && !(languages & CppLanguage) // ? QmlPerspectiveId : CppPerspectiveId; // m_mainWindow->restorePerspective(perspective); + for (DebuggerLanguage language: {QmlLanguage, CppLanguage}) { + const Context context = m_contextsForLanguage.value(language); + if (languages & language) + ICore::addAdditionalContext(context); + else + ICore::removeAdditionalContext(context); + } } //bool DockWidgetEventFilter::eventFilter(QObject *obj, QEvent *event)