From 7607f2ffbe821cd12e443a0f9161fc37d3ec03e2 Mon Sep 17 00:00:00 2001 From: Lasse Holmstedt <lasse.holmstedt@nokia.com> Date: Tue, 31 Aug 2010 14:05:33 +0200 Subject: [PATCH] Debugger UI: Removed debug language detection on mode change It did more harm than good. Now, the auto detection is only done on run control change - this is something that Creator could also remember. --- src/plugins/debugger/debuggerrunner.cpp | 3 +-- src/plugins/debugger/debuggeruiswitcher.cpp | 12 ------------ 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index fd649a3079c..282b531097e 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -498,6 +498,7 @@ void DebuggerRunControl::start() return; } + plugin()->activateDebugMode(); DebuggerUISwitcher::instance()->aboutToStartDebugger(); const QString message = tr("Starting debugger '%1' for tool chain '%2'..."). @@ -506,8 +507,6 @@ void DebuggerRunControl::start() plugin()->showMessage(DebuggerSettings::instance()->dump(), LogDebug); plugin()->runControlStarted(this); - plugin()->activateDebugMode(); - engine()->startDebugger(this); m_running = true; emit addToOutputWindowInline(this, tr("Debugging starts"), false); diff --git a/src/plugins/debugger/debuggeruiswitcher.cpp b/src/plugins/debugger/debuggeruiswitcher.cpp index 4c3f51aa741..b10ece7bc74 100644 --- a/src/plugins/debugger/debuggeruiswitcher.cpp +++ b/src/plugins/debugger/debuggeruiswitcher.cpp @@ -319,18 +319,6 @@ void DebuggerUISwitcher::modeChanged(Core::IMode *mode) //|| DebuggerPlugin::instance()->hasSnapsnots()) return; - DebuggerLanguages activeLangs; - if (isCurrentProjectCppBased()) - activeLangs |= CppLanguage; - - if (isCurrentProjectQmlCppBased()) - activeLangs |= QmlLanguage; - - if (d->m_activateCppAction) - d->m_activateCppAction->setChecked(activeLangs & CppLanguage); - if (d->m_activateQmlAction) - d->m_activateQmlAction->setChecked(activeLangs & QmlLanguage); - updateActiveLanguages(); } -- GitLab