Merge remote-tracking branch 'origin/2.8'

Conflicts:
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: I8101f18b87859924644471817d4f1408790d5628

src/plugins/debugger/debuggerplugin.cpp

@@ -154,7 +154,7 @@
 /*!
     \class Debugger::DebuggerEngine
 
-    \brief Base class of a debugger engine.
+    \brief The DebuggerEngine class is the base class of a debugger engine.
 
     Note: the Debugger process itself and any helper processes like
     gdbserver are referred to as 'Engine', whereas the debugged process
@@ -322,7 +322,8 @@ sg1: }
 
 /*!
     \class Debugger::Internal::GdbEngine
-    \brief Implementation of Debugger::Engine driving a gdb executable.
+    \brief The GdbEngine class implements Debugger::Engine driving a GDB
+    executable.
 
     GdbEngine specific startup. All happens in EngineSetupRequested state:
 
@@ -3459,11 +3460,6 @@ void DebuggerPlugin::extensionsInitialized()
     theDebuggerCore->extensionsInitialized();
 }
 
-bool DebuggerPlugin::isActiveDebugLanguage(int language)
-{
-    return theDebuggerCore->isActiveDebugLanguage(language);
-}
-
 DebuggerMainWindow *DebuggerPlugin::mainWindow()
 {
     return theDebuggerCore->m_mainWindow;