diff options
author | hjk <hjk@qt.io> | 2018-08-06 11:44:09 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2018-08-06 12:44:42 +0000 |
commit | 903e395a14595a186e86fc7c41e780a0c5901f8b (patch) | |
tree | 2af938302492d82e82d8268a44c2d0d83ba0fdd5 | |
parent | 87537724ef5ee295244a638d0285ffe0e2b9d6ce (diff) |
Adapt to recentish upstream changes
The SimpleTargetRunner takes care of conventionally setup
TerminalAspects automatically nowadays.
Change-Id: Id67048efc40111972f33905ea5a41025fff441dd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r-- | plugins/haskell/haskellrunconfiguration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/haskell/haskellrunconfiguration.cpp b/plugins/haskell/haskellrunconfiguration.cpp index 9281914..98a8317 100644 --- a/plugins/haskell/haskellrunconfiguration.cpp +++ b/plugins/haskell/haskellrunconfiguration.cpp @@ -45,6 +45,7 @@ HaskellRunConfigurationFactory::HaskellRunConfigurationFactory() registerRunConfiguration<HaskellRunConfiguration>("Haskell.RunConfiguration"); addSupportedProjectType(Constants::C_HASKELL_PROJECT_ID); addSupportedTargetDeviceType(ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE); + addRunWorkerFactory<SimpleTargetRunner>(ProjectExplorer::Constants::NORMAL_RUN_MODE); } HaskellExecutableAspect::HaskellExecutableAspect(RunConfiguration *rc) @@ -102,7 +103,6 @@ Runnable HaskellRunConfiguration::runnable() const if (!argumentsAspect->arguments().isEmpty()) r.commandLineArguments += " -- " + argumentsAspect->arguments(); r.workingDirectory = projectDirectory; - r.runMode = extraAspect<TerminalAspect>()->runMode(); r.environment = extraAspect<LocalEnvironmentAspect>()->environment(); r.executable = r.environment.searchInPath(HaskellManager::stackExecutable().toString()).toString(); return r; |