1 files changed, 19 insertions, 10 deletions
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index 04058f4aa7..73d2eb3fe9 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -32,6 +32,8 @@
 #include <utils/environment.h>
 #include <utils/fileutils.h>
 
+namespace Utils { class MacroExpander; }
+
 namespace ProjectExplorer {
 
 namespace Internal { class BuildConfigurationPrivate; }
@@ -52,7 +54,7 @@ class PROJECTEXPLORER_EXPORT BuildConfiguration : public ProjectConfiguration
 
 protected:
     friend class BuildConfigurationFactory;
-    explicit BuildConfiguration(Target *target, Core::Id id);
+    explicit BuildConfiguration(Target *target, Utils::Id id);
 
 public:
     ~BuildConfiguration() override;
@@ -77,11 +79,14 @@ public:
 
     virtual void addToEnvironment(Utils::Environment &env) const;
 
+    const QList<Utils::Id> customParsers() const;
+    void setCustomParsers(const QList<Utils::Id> &parsers);
+
     BuildStepList *buildSteps() const;
     BuildStepList *cleanSteps() const;
 
-    void appendInitialBuildStep(Core::Id id);
-    void appendInitialCleanStep(Core::Id id);
+    void appendInitialBuildStep(Utils::Id id);
+    void appendInitialCleanStep(Utils::Id id);
 
     bool fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;
@@ -118,6 +123,10 @@ public:
 
     void doInitialize(const BuildInfo &info);
 
+    Utils::MacroExpander *macroExpander() const;
+
+    bool createBuildDirectory();
+
 signals:
     void environmentChanged();
     void buildDirectoryChanged();
@@ -168,16 +177,16 @@ protected:
         = std::function<QList<BuildInfo>(const Kit *, const Utils::FilePath &, bool)>;
     void setBuildGenerator(const BuildGenerator &buildGenerator);
 
-    bool supportsTargetDeviceType(Core::Id id) const;
-    void setSupportedProjectType(Core::Id id);
+    bool supportsTargetDeviceType(Utils::Id id) const;
+    void setSupportedProjectType(Utils::Id id);
     void setSupportedProjectMimeTypeName(const QString &mimeTypeName);
-    void addSupportedTargetDeviceType(Core::Id id);
+    void addSupportedTargetDeviceType(Utils::Id id);
     void setDefaultDisplayName(const QString &defaultDisplayName);
 
     using BuildConfigurationCreator = std::function<BuildConfiguration *(Target *)>;
 
     template <class BuildConfig>
-    void registerBuildConfiguration(Core::Id buildConfigId)
+    void registerBuildConfiguration(Utils::Id buildConfigId)
     {
         m_creator = [buildConfigId](Target *t) { return new BuildConfig(t, buildConfigId); };
         m_buildConfigId = buildConfigId;
@@ -187,9 +196,9 @@ private:
     bool canHandle(const ProjectExplorer::Target *t) const;
 
     BuildConfigurationCreator m_creator;
-    Core::Id m_buildConfigId;
-    Core::Id m_supportedProjectType;
-    QList<Core::Id> m_supportedTargetDeviceTypes;
+    Utils::Id m_buildConfigId;
+    Utils::Id m_supportedProjectType;
+    QList<Utils::Id> m_supportedTargetDeviceTypes;
     QString m_supportedProjectMimeTypeName;
     IssueReporter m_issueReporter;
     BuildGenerator m_buildGenerator;