Adapt to upstream changes

Change-Id: Iab7617d66d5eada96d6e7add7a927695390c8668
Reviewed-by: hjk <hjk@qt.io>

2 files changed, 3 insertions, 3 deletions

diff --git a/plugins/haskell/haskellmanager.cpp b/plugins/haskell/haskellmanager.cpp
index a43b437..0f87c30 100644
--- a/plugins/haskell/haskellmanager.cpp
+++ b/plugins/haskell/haskellmanager.cpp
@@ -108,7 +108,7 @@ void HaskellManager::openGhci(const FilePath &haskellFile)
                       + (isHaskell ? QStringList{haskellFile.fileName()} : QStringList());
     auto p = new ConsoleProcess;
     p->setCommand({stackExecutable(), args});
-    p->setWorkingDirectory(haskellFile.toFileInfo().path());
+    p->setWorkingDirectory(haskellFile.absolutePath());
     connect(p, &ConsoleProcess::processError, p, [p](const QString &errorString) {
         Core::MessageManager::writeDisrupting(tr("Failed to run GHCi: \"%1\".").arg(errorString));
         p->deleteLater();
diff --git a/plugins/haskell/haskellrunconfiguration.cpp b/plugins/haskell/haskellrunconfiguration.cpp
index 0568606..52529a7 100644
--- a/plugins/haskell/haskellrunconfiguration.cpp
+++ b/plugins/haskell/haskellrunconfiguration.cpp
@@ -74,11 +74,11 @@ HaskellRunConfiguration::HaskellRunConfiguration(Target *target, Utils::Id id)
 
 Runnable HaskellRunConfiguration::runnable() const
 {
-    const QString projectDirectory = target()->project()->projectDirectory().toString();
+    const Utils::FilePath projectDirectory = target()->project()->projectDirectory();
     Runnable r;
     if (BuildConfiguration *buildConfiguration = target()->activeBuildConfiguration())
         r.commandLineArguments += "--work-dir \""
-                                  + QDir(projectDirectory)
+                                  + QDir(projectDirectory.toString())
                                         .relativeFilePath(
                                             buildConfiguration->buildDirectory().toString())
                                   + "\" ";