1 files changed, 12 insertions, 9 deletions

diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index 55870aefa1..a8eef60e43 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -40,7 +40,6 @@ QT_END_NAMESPACE
 
 namespace Core {
 class IMode;
-class Id;
 } // namespace Core
 
 namespace Utils {
@@ -59,6 +58,8 @@ class FileNode;
 
 namespace Internal {
 class AppOutputSettings;
+class CustomParserSettings;
+class MiniProjectTargetSelector;
 class ProjectExplorerSettings;
 }
 
@@ -140,6 +141,9 @@ public:
     static const BuildPropertiesSettings &buildPropertiesSettings();
     static void showQtSettings();
 
+    static void setCustomParsers(const QList<Internal::CustomParserSettings> &settings);
+    static const QList<Internal::CustomParserSettings> customParsers();
+
     static void startRunControl(RunControl *runControl);
     static void showOutputPaneForRunControl(RunControl *runControl);
 
@@ -149,10 +153,10 @@ public:
     static bool isProjectFile(const Utils::FilePath &filePath);
     static QList<QPair<QString, QString> > recentProjects();
 
-    static bool canRunStartupProject(Core::Id runMode, QString *whyNot = nullptr);
-    static void runProject(Project *pro, Core::Id, const bool forceSkipDeploy = false);
-    static void runStartupProject(Core::Id runMode, bool forceSkipDeploy = false);
-    static void runRunConfiguration(RunConfiguration *rc, Core::Id runMode,
+    static bool canRunStartupProject(Utils::Id runMode, QString *whyNot = nullptr);
+    static void runProject(Project *pro, Utils::Id, const bool forceSkipDeploy = false);
+    static void runStartupProject(Utils::Id runMode, bool forceSkipDeploy = false);
+    static void runRunConfiguration(RunConfiguration *rc, Utils::Id runMode,
                              const bool forceSkipDeploy = false);
     static QList<QPair<Runnable, Utils::ProcessHandle>> runningRunControlProcesses();
     static QList<RunControl *> allRunControls();
@@ -161,11 +165,10 @@ public:
 
     static void initiateInlineRenaming();
 
-    static QString displayNameForStepId(Core::Id stepId);
-
     static QStringList projectFileGlobs();
 
     static QThreadPool *sharedThreadPool();
+    static Internal::MiniProjectTargetSelector *targetSelector();
 
     static void showSessionManager();
     static void openNewProjectDialog();
@@ -176,7 +179,7 @@ public:
 
     static void updateActions();
 
-    static void activateProjectPanel(Core::Id panelId);
+    static void activateProjectPanel(Utils::Id panelId);
     static void clearRecentProjects();
     static void removeFromRecentProjects(const QString &fileName, const QString &displayName);
 
@@ -192,6 +195,7 @@ signals:
     void recentProjectsChanged();
 
     void settingsChanged();
+    void customParsersChanged();
 
     void runActionsUpdated();
 
@@ -227,7 +231,6 @@ private slots:
 
     void testGnuMakeParserParsing_data();
     void testGnuMakeParserParsing();
-    void testGnuMakeParserTaskMangling_data();
     void testGnuMakeParserTaskMangling();
 
     void testXcodebuildParserParsing_data();