aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2023-01-24 14:29:51 +0100
committerChristian Stenger <christian.stenger@qt.io>2023-01-24 13:38:24 +0000
commitafcdcb2a8e68d5f8d3ee7f900c3737db4bb81339 (patch)
tree9dc0fed93a72a46eedc766fefc3fd5b2ac4c13f5
parent995fe3c6da501d05ee11ec77d377690e55236fbb (diff)
Adapt to upstream changeHEADmaster
Change-Id: I2d3535f579f0e5c9e350bc548e59fc43189b2a8b Reviewed-by: hjk <hjk@qt.io>
-rw-r--r--plugins/haskell/haskellplugin.cpp1
-rw-r--r--plugins/haskell/haskellrunconfiguration.cpp1
-rw-r--r--plugins/haskell/haskellrunconfiguration.h9
3 files changed, 2 insertions, 9 deletions
diff --git a/plugins/haskell/haskellplugin.cpp b/plugins/haskell/haskellplugin.cpp
index e917116..c3ae400 100644
--- a/plugins/haskell/haskellplugin.cpp
+++ b/plugins/haskell/haskellplugin.cpp
@@ -54,6 +54,7 @@ public:
HaskellBuildConfigurationFactory buildConfigFactory;
StackBuildStepFactory stackBuildStepFactory;
HaskellRunConfigurationFactory runConfigFactory;
+ ProjectExplorer::SimpleTargetRunnerFactory runWorkerFactory{{Constants::C_HASKELL_RUNCONFIG_ID}};
};
HaskellPlugin::~HaskellPlugin()
diff --git a/plugins/haskell/haskellrunconfiguration.cpp b/plugins/haskell/haskellrunconfiguration.cpp
index 2df820e..7457471 100644
--- a/plugins/haskell/haskellrunconfiguration.cpp
+++ b/plugins/haskell/haskellrunconfiguration.cpp
@@ -25,6 +25,7 @@
#include "haskellrunconfiguration.h"
+#include "haskellconstants.h"
#include "haskellmanager.h"
#include "haskellproject.h"
diff --git a/plugins/haskell/haskellrunconfiguration.h b/plugins/haskell/haskellrunconfiguration.h
index 1af3bd9..27e4a83 100644
--- a/plugins/haskell/haskellrunconfiguration.h
+++ b/plugins/haskell/haskellrunconfiguration.h
@@ -25,8 +25,6 @@
#pragma once
-#include "haskellconstants.h"
-
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/runconfigurationaspects.h>
#include <projectexplorer/runcontrol.h>
@@ -50,13 +48,6 @@ class HaskellRunConfigurationFactory : public ProjectExplorer::RunConfigurationF
{
public:
HaskellRunConfigurationFactory();
-
-private:
- ProjectExplorer::RunWorkerFactory runWorkerFactory{
- ProjectExplorer::RunWorkerFactory::make<ProjectExplorer::SimpleTargetRunner>(),
- {ProjectExplorer::Constants::NORMAL_RUN_MODE},
- {Constants::C_HASKELL_RUNCONFIG_ID},
- {ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE}};
};
class HaskellExecutableAspect : public Utils::StringAspect