diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-07-12 13:26:45 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-07-12 13:26:45 +0200 |
| commit | aaa8e82801a512ff7aa7a654736c2037f0665187 (patch) | |
| tree | 3b95a912700fc88a2742f44b08eb9f2c14532161 /plugins/haskell | |
| parent | 28027140f4f62803868b1b5d0033bd3952e653e9 (diff) | |
| parent | 005741dcbf04e15491fa711941f4abc6ab8de355 (diff) | |
Merge remote-tracking branch 'origin/8.0'
Change-Id: If4ed9904a146f3ec5bba0530890198f55cf977bb
Diffstat (limited to 'plugins/haskell')
| -rw-r--r-- | plugins/haskell/haskellmanager.cpp | 8 | ||||
| -rw-r--r-- | plugins/haskell/haskellrunconfiguration.cpp | 1 | ||||
| -rw-r--r-- | plugins/haskell/haskellrunconfiguration.h | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/plugins/haskell/haskellmanager.cpp b/plugins/haskell/haskellmanager.cpp index 2604341..dd6a371 100644 --- a/plugins/haskell/haskellmanager.cpp +++ b/plugins/haskell/haskellmanager.cpp @@ -111,11 +111,13 @@ void HaskellManager::openGhci(const FilePath &haskellFile) p->setTerminalMode(TerminalMode::On); p->setCommand({stackExecutable(), args}); p->setWorkingDirectory(haskellFile.absolutePath()); - connect(p, &QtcProcess::errorOccurred, p, [p] { - Core::MessageManager::writeDisrupting(tr("Failed to run GHCi: \"%1\".").arg(p->errorString())); + connect(p, &QtcProcess::done, p, [p] { + if (p->result() != ProcessResult::FinishedWithSuccess) { + Core::MessageManager::writeDisrupting( + tr("Failed to run GHCi: \"%1\".").arg(p->errorString())); + } p->deleteLater(); }); - connect(p, &QtcProcess::finished, p, &QObject::deleteLater); p->start(); } diff --git a/plugins/haskell/haskellrunconfiguration.cpp b/plugins/haskell/haskellrunconfiguration.cpp index b52c658..2df820e 100644 --- a/plugins/haskell/haskellrunconfiguration.cpp +++ b/plugins/haskell/haskellrunconfiguration.cpp @@ -30,7 +30,6 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/localenvironmentaspect.h> -#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/runconfigurationaspects.h> #include <projectexplorer/runcontrol.h> #include <projectexplorer/target.h> diff --git a/plugins/haskell/haskellrunconfiguration.h b/plugins/haskell/haskellrunconfiguration.h index a3da33a..1af3bd9 100644 --- a/plugins/haskell/haskellrunconfiguration.h +++ b/plugins/haskell/haskellrunconfiguration.h @@ -27,6 +27,7 @@ #include "haskellconstants.h" +#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/runconfigurationaspects.h> #include <projectexplorer/runcontrol.h> #include <utils/aspects.h> |