diff --git a/app/kdevelopui.rc b/app/kdevelopui.rc
index dca8569a3d..be783f7b93 100644
--- a/app/kdevelopui.rc
+++ b/app/kdevelopui.rc
@@ -1,211 +1,211 @@
 <!DOCTYPE gui SYSTEM "kpartgui.dtd">
-<gui version="147" name="kdevelop" translationDomain="kdevelop">
+<gui version="148" name="kdevelop" translationDomain="kdevelop">
 <MenuBar>
 
   <Menu name="session" append="first_menu">
     <text context="@title:menu">Session</text>
   </Menu>
 
   <Menu name="project" append="first_menu">
     <text context="@title:menu">&amp;Project</text>
     <DefineGroup name="project_new"/>
     <Separator/>
     <Action name="project_open"/>
     <Action name="project_fetch"/>
     <Action name="project_open_recent"/>
     <Action name="project_open_for_file"/>
     <Separator/>
 
     <Merge />
     <Separator />
     <Action name="project_open_config" />
 
     <Separator/>
     <Action name="project_close"/>
     <Action name="project_close_all"/>
   </Menu>
 
   <Menu name="run" append="first_menu">
     <text context="@title:menu">&amp;Run</text>
 
     <Action name="run_default_target" />
     <Action name="configure_launches" />
     <Action name="run_execute" /> <!-- ### remove me -->
     <Action name="run_debug" /> <!-- ### remove me -->
     <Action name="run_profile" /> <!-- ### remove me -->
 
     <Action name="switch_runtimes" />
     <Menu name="debug_core_menu">
       <text context="@title:menu">Examine Core File</text>
     </Menu>
 
     <Menu name="debug_attach_menu">
       <text context="@title:menu">Attach to Process</text>
     </Menu>
 
     <Separator />
     <DefineGroup name="run_operations" />
     <Separator />
 
     <Action name="run_stop_all" />
     <Action name="run_stop_menu" />
 
 
     <Separator />
     <DefineGroup name="debug" /> <!-- ### remove me -->
 
     <Separator />
     <DefineGroup name="runtime_operations" />
 
     <Separator />
     <Merge />
   </Menu>
 
   <Menu name="navigation" append="first_menu">
     <text context="@title:menu">&amp;Navigation</text>
     <DefineGroup name="navigation_file"/>
     <Separator />
     <Action name="prev_error" />
     <Action name="next_error" />
     <Separator />
     <DefineGroup name="navigation_code"/>
     <Separator />
     <DefineGroup name="navigation_fxn"/>
     <Separator />
     <DefineGroup name="navigation_jmp"/>
     <Separator />
     <DefineGroup name="navigation_use"/>
     <Separator />
     <DefineGroup name="navigation_cxt"/>
     <Separator />
     <Action name="source_browse_mode"/>
     <Separator />
     <Merge />
   </Menu>
 
   <Separator append="first_menu" style="visible"/>
 
   <Menu name="file">
     <text context="@title:menu">&amp;File</text>
     <DefineGroup append="new_merge" name="new_merge"/>
     <DefineGroup append="open_merge" name="open_merge"/>
     <DefineGroup append="save_merge" name="save_merge"/>
     <DefineGroup append="revert_merge" name="revert_merge"/>
     <DefineGroup append="print_merge" name="print_merge"/>
     <Action name="file_closeother" append="close_merge"/>
     <DefineGroup append="close_merge" name="close_merge"/>
   </Menu>
 
   <Menu name="edit">
     <text context="@title:menu">&amp;Edit</text>
     <DefineGroup append="edit_undo_merge" name="edit_undo_merge"/>
     <DefineGroup append="edit_paste_merge" name="edit_paste_merge"/>
     <DefineGroup append="edit_select_merge" name="edit_select_merge"/>
     <DefineGroup append="edit_find_merge" name="edit_find_merge"/>
     <DefineGroup name="edit_formatting"/>
     <Separator/>
     <Merge/>
   </Menu>
 
   <Merge />
 
   <Menu name="code">
     <text context="@title:menu">Code</text>
     <Menu name="analyze_file" icon="dialog-ok">
       <text context="@title:menu">Analyze Current File With</text>
       <Merge />
     </Menu>
     <Menu name="analyze_project" icon="dialog-ok">
       <text context="@title:menu">Analyze Current Project With</text>
       <Merge />
     </Menu>
     <Merge/>
   </Menu>
 
   <Separator style="visible" />
 
   <Menu name="window">
     <text context="@title:menu">&amp;Window</text>
     <Action name="new_window"/>
     <Separator/>
     <Action name="add_toolview"/>
     <Action name="select_previous_dock"/>
     <Action name="select_next_dock"/>
     <Action name="docks_submenu"/>
     <Action name="user_interface"/>
     <DefineGroup name="history_operations"/>
     <Action name="history_back"/>
     <Action name="history_forward"/>
     <Separator/>
     <Action name="file_switchto"/>
     <Separator/>
     <DefineGroup name="error_operations"/>
     <Separator/>
     <Merge/>
     <Separator/>
     <DefineGroup name="view_operations"/>
     <Action name="view_previous_window"/>
     <Action name="view_next_window"/>
     <Separator/>
     <Action name="split_horizontal"/>
     <Action name="split_vertical"/>
     <Action name="view_previous_split"/>
     <Action name="view_next_split"/>
     <Separator/>
     <DefineGroup name="window_operations"/>
     <Separator/>
     <Action name="focus_editor"/>
     <Separator/>
     <Action name="show_left_dock"/>
     <Action name="show_right_dock"/>
     <Action name="show_bottom_dock"/>
     <Action name="hide_all_docks"/>
     <Separator/>
     <Action name="toggle_concentration_mode"/>
     <Separator/>
     <Merge/>
   </Menu>
 
   <Menu name="settings">
     <text context="@title:menu">Settings</text>
     <Action name="colorscheme_menu"/>
     <DefineGroup append="show_toolbar_merge" name="show_toolbar_merge"/>
     <DefineGroup append="show_merge" name="show_merge" />
     <DefineGroup append="configure_merge" name="configure_merge" />
   </Menu>
 
   <Menu name="help">
     <text context="@title:menu">Help</text>
     <Action name="loaded_plugins" append="about_merge" />
     <Action name="about_platform" append="about_merge" />
   </Menu>
 
 </MenuBar>
 
 <ToolBar name="mainToolBar" position="Top" noMerge="1">
   <text>Main Toolbar</text>
   <Action name="area_switcher"/>
   <Separator/>
   <DefineGroup append="build_operations" name="build_operations"/>
   <DefineGroup append="run_operations" name="run_operations"/>
   <Action name="switch_runtimes" group="run_operations"/>
   <Action name="run_execute" group="run_operations"/>
   <Action name="run_debug" group="run_operations"/>
   <Action name="run_stop_all" group="run_operations" />
   <Action name="run_stop_menu" group="run_operations" />
   <Separator/>
   <Action name="file_new" />
   <DefineGroup append="file_operations" name="file_operations"/>
   <DefineGroup append="edit_operations" name="edit_operations"/>
   <Separator/>
   <Action name="commit_current_project" />
   <Action name="switch_runtimes" />
 </ToolBar>
 
 <Menu name="rb_popup">
   <Separator/>
   <Action name="file_close"/>
   <Action name="file_closeother"/>
 </Menu>
 
 </gui>
diff --git a/kdevplatform/interfaces/iplugincontroller.h b/kdevplatform/interfaces/iplugincontroller.h
index 4a636f05de..d327318614 100644
--- a/kdevplatform/interfaces/iplugincontroller.h
+++ b/kdevplatform/interfaces/iplugincontroller.h
@@ -1,200 +1,201 @@
 /* This file is part of the KDE project
 Copyright 2004, 2007 Alexander Dymo <adymo@kdevelop.org>
 Copyright 2006 Matt Rogers <mattr@kde.org>
 Copyright 2007 Andreas Pakulat <apaku@gmx.de>
 
 Based on code from Kopete
 Copyright 2002-2003 Martijn Klingens <klingens@kde.org>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public
 License as published by the Free Software Foundation; either
 version 2 of the License, or (at your option) any later version.
 
 This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public License
 along with this library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.
 */
 #ifndef KDEVPLATFORM_IPLUGINCONTROLLER_H
 #define KDEVPLATFORM_IPLUGINCONTROLLER_H
 
 #include <QObject>
 #include <QList>
+#include <QVector>
 #include <QVariant>
 
 #include <KPluginMetaData>
 
 #include "iplugin.h"
 #include "interfacesexport.h"
 
 class QExtensionManager;
 
 namespace KDevelop
 {
 class ProfileEngine;
 
 /**
  * The KDevelop plugin controller.
  * The Plugin controller is responsible for querying, loading and unloading
  * available plugins.
  *
  * Most of the time if you want to get at a plugin you should be using
  * extensionForPlugin with the extension interface name. If you need to get at
  * the actual \c IPlugin* pointer to connect signals/slots you should use
  * \c pluginForExtension() and then the IPlugin's extension member function to get
  * at the extension interface if necessary.
  *
  * If you have the need to load a specific plugin for a given extension both
  * functions have an optional second parameter that allows one to specify the
  * name of the plugin as declared in the \c .desktop file under the
  * \c X-KDE-PluginInfo-Name property. This should be used only very seldomly in
  * real code and is mostly meant for testing and for implementation in the
  * shell as it makes the code dependent on the plugin name which may change and
  * also the actual plugin implementation so users cannot exchange one plugin
  * with another also implementing the same interface.
  *
  */
 class KDEVPLATFORMINTERFACES_EXPORT IPluginController : public QObject
 {
 
 Q_OBJECT
 
 public:
     /**
      * \brief Indicates the plugin type
      * This is used to determine how the plugin is loaded
      */
     enum PluginType {
         Global = 0, ///< Indicates that the plugin is loaded at startup
         Project ///< Indicates that the plugin is loaded with the first opened project
     };
 
     explicit IPluginController( QObject* parent = nullptr );
 
     ~IPluginController() override;
 
     /**
      * Get the plugin info for a loaded plugin
      */
     virtual KPluginMetaData pluginInfo(const IPlugin*) const = 0;
 
     /**
      * Find the KPluginMetaData structure for the given @p pluginId.
      */
     virtual KPluginMetaData infoForPluginId(const QString &pluginId) const = 0;
 
     /**
      * Get a list of currently loaded plugins
      */
     virtual QList<IPlugin*> loadedPlugins() const = 0;
 
     /**
      * @brief Unloads the plugin specified by @p plugin
      *
      * @param plugin The name of the plugin as specified by the
      * X-KDE-PluginInfo-Name key of the .desktop file for the plugin
      */
     virtual bool unloadPlugin( const QString & plugin ) = 0;
 
     /**
      * @brief Loads the plugin specified by @p pluginName
      *
      * @param pluginName the name of the plugin, as given in the X-KDE-PluginInfo-Name property
      * @returns a pointer to the plugin instance or 0
      */
     virtual IPlugin* loadPlugin( const QString & pluginName ) = 0;
 
      /**
      * Retrieve a plugin which supports the given extension interface.
      *
      * All already loaded plugins will be queried and the first one to support the extension interface
      * will be returned. Any plugin can be an extension, only the "ServiceTypes=..." entry is
      * required in .desktop file for that plugin.
      *
      * If no already-loaded plugin was found, we try to load a plugin for the given extension.
      *
      * If no plugin was found, a nullptr will be returned.
      *
      * @param extension The extension interface. Can be empty if you want to find a plugin by name or other constraint.
      * @param pluginName The name of the plugin to load if multiple plugins for the extension exist, corresponds to the X-KDE-PluginInfo-Name
      * @param constraints A map of constraints on other plugin info properties.
      * @return A KDevelop extension plugin for given service type or 0 if no plugin supports it
      */
     virtual IPlugin *pluginForExtension(const QString &extension, const QString& pluginName = {}, const QVariantMap& constraints = QVariantMap()) = 0;
 
      /**
      * Retrieve a list of plugins which supports the given extension interface.
      * All already loaded plugins will be queried and the first one to support the extension interface
      * will be returned. Any plugin can be an extension, only the "ServiceTypes=..." entry is
      * required in .desktop file for that plugin.
      * @param extension The extension interface
      * @param constraints A map of constraints on other plugin info properties.
      * @return A KDevelop extension plugin for given service type or 0 if no plugin supports it
      */
     virtual QList<IPlugin*> allPluginsForExtension(const QString &extension, const QVariantMap& constraints = QVariantMap()) = 0;
 
      /**
      * Retrieve the plugin which supports given extension interface and
      * returns a pointer to the extension interface.
      *
      * All already loaded plugins will be queried and the first one to support the extension interface
      * will be returned. Any plugin can be an extension, only "ServiceTypes=..." entry is
      * required in .desktop file for that plugin.
      * @param extension The extension interface
      * @param pluginName The name of the plugin to load if multiple plugins for the extension exist, corresponds to the X-KDE-PluginInfo-Name
      * @return Pointer to the extension interface or 0 if no plugin supports it
       */
     template<class Extension> Extension* extensionForPlugin( const QString &extension = {}, const QString &pluginName = {})
     {
         QString ext;
         if( extension.isEmpty() ) {
             ext = QString::fromUtf8(qobject_interface_iid<Extension*>());
         } else {
             ext = extension;
         }
         IPlugin *plugin = pluginForExtension(ext, pluginName);
         if (plugin) {
             return plugin->extension<Extension>();
         }
         return nullptr;
     }
 
     /**
      * Query for plugin information on KDevelop plugins implementing the given extension.
      *
      * The service version is checked for automatically and the only serviceType
      * searched for is "KDevelop/Plugin"
      *
      * @param extension The extension that should be implemented by the plugin, i.e. listed in X-KDevelop-Interfaces.
      * @param constraints A map of constraints on other plugin info properties.
      * @return The list of plugin offers.
      */
     virtual QVector<KPluginMetaData> queryExtensionPlugins(const QString &extension, const QVariantMap& constraints = QVariantMap()) const = 0;
 
     virtual QList<ContextMenuExtension> queryPluginsForContextMenuExtensions(KDevelop::Context* context, QWidget* parent) const = 0;
 
 Q_SIGNALS:
     void loadingPlugin( const QString& );
     void pluginLoaded( KDevelop::IPlugin* );
     void unloadingPlugin( KDevelop::IPlugin* );
     /**
      * This signal is emitted whenever a plugin is unloaded.
      * @note: that you shouldn't use the pointer anymore
      * except for comparing it against against other pointers. The plugin instance can already have been completely
      * deleted when this signal is emitted.
      */
     void pluginUnloaded( KDevelop::IPlugin* );
 
 private:
     friend class IPlugin;
 };
 
 }
 #endif