Merge remote-tracking branch 'origin/8.0'

Change-Id: If4ed9904a146f3ec5bba0530890198f55cf977bb

4 files changed, 14 insertions, 12 deletions

diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
index 6270c29..22d3bcd 100644
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -4,9 +4,9 @@ on: [push]
 
 env:
   PLUGIN_NAME: Haskell
-  QT_VERSION: 6.2.1
-  QT_CREATOR_VERSION: 6.0.0
-  QT_CREATOR_SNAPSHOT: NO
+  QT_VERSION: 6.3.1
+  QT_CREATOR_VERSION: 8.0.0-beta2
+  QT_CREATOR_SNAPSHOT: latest
   CMAKE_VERSION: 3.21.1
   NINJA_VERSION: 1.10.2
 
@@ -18,8 +18,8 @@ jobs:
       matrix:
         config:
         - {
-            name: "Windows Latest MSVC", artifact: "Windows-x64",
-            os: windows-latest,
+            name: "Windows MSVC 2019", artifact: "Windows-x64",
+            os: windows-2019,
             cc: "cl", cxx: "cl",
             environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
           }
@@ -107,17 +107,17 @@ jobs:
           set(url_os "windows_x86")
           set(qt_package_arch_suffix "win64_msvc2019_64")
           set(qt_dir_prefix "${qt_version}/msvc2019_64")
-          set(qt_package_suffix "-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86_64")
+          set(qt_package_suffix "-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64")
         elseif ("${{ runner.os }}" STREQUAL "Linux")
           set(url_os "linux_x64")
           set(qt_package_arch_suffix "gcc_64")
           set(qt_dir_prefix "${qt_version}/gcc_64")
-          set(qt_package_suffix "-Linux-RHEL_8_2-GCC-Linux-RHEL_8_2-X86_64")
+          set(qt_package_suffix "-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64")
         elseif ("${{ runner.os }}" STREQUAL "macOS")
           set(url_os "mac_x64")
           set(qt_package_arch_suffix "clang_64")
           set(qt_dir_prefix "${qt_version}/macos")
-          set(qt_package_suffix "-MacOS-MacOS_11_00-Clang-MacOS-MacOS_11_00-X86_64-ARM64")
+          set(qt_package_suffix "-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64")
         endif()
 
         set(qt_base_url "https://download.qt.io/online/qtsdkrepository/${url_os}/desktop/qt6_${qt_version_dotless}")
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>