aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2022-01-20 16:18:54 +0100
committerChristian Stenger <christian.stenger@qt.io>2022-01-20 15:33:40 +0000
commiteb77287d97bcc97f6097d4e3f4a792415f2f02c5 (patch)
treec87d222c360512259effe2718fe8955432910484
parent84dc13c0adde5de4e9cb5e25c36bb5a8b5960c3a (diff)
Adapt to upstream changes
Change-Id: Ie21f7298ee0fcfa7ecba55d47dcda1ce58d1eb81 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
-rw-r--r--plugins/haskell/haskellmanager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/haskell/haskellmanager.cpp b/plugins/haskell/haskellmanager.cpp
index 0f87c30..cd3d641 100644
--- a/plugins/haskell/haskellmanager.cpp
+++ b/plugins/haskell/haskellmanager.cpp
@@ -106,14 +106,14 @@ void HaskellManager::openGhci(const FilePath &haskellFile)
});
const auto args = QStringList{"ghci"}
+ (isHaskell ? QStringList{haskellFile.fileName()} : QStringList());
- auto p = new ConsoleProcess;
+ auto p = new ConsoleProcess(this);
p->setCommand({stackExecutable(), args});
p->setWorkingDirectory(haskellFile.absolutePath());
- connect(p, &ConsoleProcess::processError, p, [p](const QString &errorString) {
- Core::MessageManager::writeDisrupting(tr("Failed to run GHCi: \"%1\".").arg(errorString));
+ connect(p, &ConsoleProcess::errorOccurred, p, [p] {
+ Core::MessageManager::writeDisrupting(tr("Failed to run GHCi: \"%1\".").arg(p->errorString()));
p->deleteLater();
});
- connect(p, &ConsoleProcess::stubStopped, p, &QObject::deleteLater);
+ connect(p, &ConsoleProcess::finished, p, &QObject::deleteLater);
p->start();
}