diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-10-24 14:31:50 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-10-24 14:31:50 +0200 |
| commit | b7fd81f7ad7d4b5df8f3934708ab6bc0b3acb14e (patch) | |
| tree | 5a36f4ba921cac301751d05d91d7b0eefaa66340 /plugins/haskell/haskellrunconfiguration.cpp | |
| parent | 160059525a52aa43e6ef694dec8a65691d35bd75 (diff) | |
| parent | d59eb32ce6271f8f7069b4d526ba767ae59c8aed (diff) | |
Merge remote-tracking branch 'origin/4.11'
Change-Id: I9a88c1f0dbde55bb2e843efdeb992e4961f4eaba
Diffstat (limited to 'plugins/haskell/haskellrunconfiguration.cpp')
| -rw-r--r-- | plugins/haskell/haskellrunconfiguration.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/haskell/haskellrunconfiguration.cpp b/plugins/haskell/haskellrunconfiguration.cpp index 78ea231..f2f47c5 100644 --- a/plugins/haskell/haskellrunconfiguration.cpp +++ b/plugins/haskell/haskellrunconfiguration.cpp @@ -25,7 +25,6 @@ #include "haskellrunconfiguration.h" -#include "haskellconstants.h" #include "haskellmanager.h" #include "haskellproject.h" @@ -43,7 +42,7 @@ namespace Internal { HaskellRunConfigurationFactory::HaskellRunConfigurationFactory() { - registerRunConfiguration<HaskellRunConfiguration>("Haskell.RunConfiguration"); + registerRunConfiguration<HaskellRunConfiguration>(Constants::C_HASKELL_RUNCONFIG_ID); addSupportedProjectType(Constants::C_HASKELL_PROJECT_ID); addSupportedTargetDeviceType(ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE); } @@ -96,7 +95,7 @@ Runnable HaskellRunConfiguration::runnable() const r.commandLineArguments += " -- " + arguments; r.workingDirectory = projectDirectory; r.environment = aspect<LocalEnvironmentAspect>()->environment(); - r.executable = r.environment.searchInPath(HaskellManager::stackExecutable().toString()).toString(); + r.executable = r.environment.searchInPath(HaskellManager::stackExecutable().toString()); return r; } |