diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h
index 13e9f4f08c1eb5bf88dac417ed666d78249709f9..b968f4c3933748ef5c7143dcf02b225ba1e5f59c 100644
--- a/src/plugins/debugger/debuggermanager.h
+++ b/src/plugins/debugger/debuggermanager.h
@@ -258,7 +258,7 @@ public slots:
 public slots: // FIXME
     void showDebuggerOutput(const QString &msg)
         { showDebuggerOutput(LogDebug, msg); }
-   void ensureLogVisible();
+    void ensureLogVisible();
 
 //private slots:  // FIXME
     void showDebuggerOutput(int channel, const QString &msg);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 30e814e21b3494cf45bf88281d4bd9cb41474e46..11df358d8244d16a654746904ef145249224abc2 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1251,6 +1251,7 @@ void DebuggerPlugin::languageChanged(const QString &language)
     m_attachCoreAction->setVisible(debuggerIsCPP);
     m_startRemoteAction->setVisible(debuggerIsCPP);
     m_detachAction->setVisible(debuggerIsCPP);
+
 }
 
 void DebuggerPlugin::writeSettings() const
diff --git a/src/plugins/debugger/debuggeruiswitcher.cpp b/src/plugins/debugger/debuggeruiswitcher.cpp
index 2a5d6ab8c06f600b40980b97dd931ee4f466d4a6..0a2343ef8dfa7987a8e41f302b4adeb9855bd7e4 100644
--- a/src/plugins/debugger/debuggeruiswitcher.cpp
+++ b/src/plugins/debugger/debuggeruiswitcher.cpp
@@ -6,7 +6,7 @@
 
 #include <utils/savedaction.h>
 #include <utils/styledbar.h>
-
+#include <coreplugin/actionmanager/command.h>
 #include <debugger/debuggerconstants.h>
 #include <debugger/debuggeractions.h>
 
@@ -73,6 +73,8 @@ struct DebuggerUISwitcherPrivate {
     Core::ActionContainer *m_viewsMenu;
     Core::ActionContainer *m_debugMenu;
 
+    QMultiHash< int, Core::Command *> m_menuCommands;
+
     static DebuggerUISwitcher *m_instance;
 };
 
@@ -119,9 +121,11 @@ DebuggerUISwitcher::~DebuggerUISwitcher()
     delete d;
 }
 
+void DebuggerUISwitcher::addMenuAction(Core::Command *command, const QString &langName,
+                                       const QString &group)
 {
     d->m_debugMenu->addAction(command, group);
-    m_menuCommands.insert(d->m_languages.indexOf(langName), command);
+    d->m_menuCommands.insert(d->m_languages.indexOf(langName), command);
 }
 
 void DebuggerUISwitcher::setActiveLanguage(const QString &langName)
@@ -270,8 +274,9 @@ void DebuggerUISwitcher::changeDebuggerUI(const QString &langName)
                 menuitem.second->setVisible(false);
             }
         }
+
         d->m_languageMenu->menu()->setTitle(tr("Language") + " (" + langName + ")");
-        QHashIterator<int, Core::Command *> iter(m_menuCommands);
+        QHashIterator<int, Core::Command *> iter(d->m_menuCommands);
         while (iter.hasNext()) {
             iter.next();
             bool active = (iter.key() == langId);
diff --git a/src/plugins/debugger/debuggeruiswitcher.h b/src/plugins/debugger/debuggeruiswitcher.h
index cb1a14a53e3fd720d6b178c5e0f1bf5e7def7cfc..b06db60d3c6a9d03cb5b9b94e7dd60e2d0765ee5 100644
--- a/src/plugins/debugger/debuggeruiswitcher.h
+++ b/src/plugins/debugger/debuggeruiswitcher.h
@@ -89,7 +89,6 @@ private:
     QWidget *createMainWindow(Core::BaseMode *mode);
 
     DebuggerUISwitcherPrivate *d;
-    QMultiHash< int, Core::Command *> m_menuCommands;
     Utils::SavedAction *m_changeLanguageAction;
 };