Core: Move MenuBarFilter closer to its peers

Change-Id: I9d7eac297a06fae39ef7ee19841547e8b5bea45a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

src/plugins/coreplugin/coreplugin.cpp

@@ -31,7 +31,6 @@
 #include "infobar.h"
 #include "iwizardfactory.h"
 #include "mainwindow.h"
-#include "menubarfilter.h"
 #include "modemanager.h"
 #include "reaper_p.h"
 #include "themechooser.h"
@@ -152,8 +151,6 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
         InfoBar::initialize(ICore::settings(), creatorTheme());
     }
 
-    addAutoReleasedObject(new MenuBarFilter);
-
     IWizardFactory::initialize();
 
     // Make sure we respect the process's umask when creating new files

src/plugins/coreplugin/locator/locator.cpp

@@ -35,6 +35,7 @@
 #include "locatormanager.h"
 #include "locatorsettingspage.h"
 #include "locatorwidget.h"
+#include "menubarfilter.h"
 #include "opendocumentsfilter.h"
 
 #include <coreplugin/coreplugin.h>
@@ -80,6 +81,7 @@ public:
     ExecuteFilter m_executeFilter;
     ExternalToolsFilter m_externalToolsFilter;
     LocatorFiltersFilter m_locatorsFiltersFilter;
+    MenuBarFilter m_menubarFilter;
 #ifdef Q_OS_MACOS
     SpotlightLocatorFilter m_spotlightLocatorFilter;
 #endif