Adapt to upstream changes

In FileName, and project management

Change-Id: I8c549c56e2de6dd1fc3f9451e3964bad31327651
Reviewed-by: hjk <hjk@qt.io>

1 files changed, 18 insertions, 12 deletions

diff --git a/plugins/haskell/haskellrunconfiguration.h b/plugins/haskell/haskellrunconfiguration.h
index 578fc72..62bbd3d 100644
--- a/plugins/haskell/haskellrunconfiguration.h
+++ b/plugins/haskell/haskellrunconfiguration.h
@@ -26,34 +26,40 @@
 #pragma once
 
 #include <projectexplorer/runconfigurationaspects.h>
+#include <projectexplorer/runcontrol.h>
 
 namespace Haskell {
 namespace Internal {
 
-class HaskellRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory
+class HaskellRunConfiguration : public ProjectExplorer::RunConfiguration
 {
+    Q_OBJECT
+
 public:
-    HaskellRunConfigurationFactory();
+    HaskellRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
+
+private:
+    void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &info) final;
+    ProjectExplorer::Runnable runnable() const final;
 };
 
-class HaskellExecutableAspect : public ProjectExplorer::BaseStringAspect
+class HaskellRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory
 {
-    Q_OBJECT
-
 public:
-    HaskellExecutableAspect();
+    HaskellRunConfigurationFactory();
+
+private:
+    ProjectExplorer::SimpleRunWorkerFactory<ProjectExplorer::SimpleTargetRunner,
+                                            HaskellRunConfiguration>
+        runWorkerFactory;
 };
 
-class HaskellRunConfiguration : public ProjectExplorer::RunConfiguration
+class HaskellExecutableAspect : public ProjectExplorer::BaseStringAspect
 {
     Q_OBJECT
 
 public:
-    HaskellRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
-
-private:
-    void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &info) final;
-    ProjectExplorer::Runnable runnable() const final;
+    HaskellExecutableAspect();
 };
 
 } // namespace Internal