Merge remote-tracking branch 'origin/4.13'

Change-Id: I685e47aa8adab676981d4f455f835c140218e59f

7 files changed, 19 insertions, 21 deletions

diff --git a/.github/workflows/build_qmake.yml b/.github/workflows/build_qmake.yml
index fcd9e48..980341f 100644
--- a/.github/workflows/build_qmake.yml
+++ b/.github/workflows/build_qmake.yml
@@ -129,7 +129,7 @@ jobs:
         endif()
 
         if ("${{ runner.os }}" STREQUAL "Windows")
-          set(qtc_output_directory "qtcreator/lib/qtcreator/plugins")
+          set(qtc_output_directory "target/lib/qtcreator/plugins")
           set(qtc_binary_name "$ENV{PLUGIN_NAME}4.dll")
           if ("${{ matrix.config.environment_script }}" MATCHES "vcvars64.bat")
             set(qtc_platform "windows_x64")
@@ -137,11 +137,11 @@ jobs:
             set(qtc_platform "windows_x86")
           endif()
         elseif ("${{ runner.os }}" STREQUAL "Linux")
-          set(qtc_output_directory "qtcreator/lib/qtcreator/plugins")
+          set(qtc_output_directory "target/lib/qtcreator/plugins")
           set(qtc_binary_name "lib$ENV{PLUGIN_NAME}.so")
           set(qtc_platform "linux_x64")
         elseif ("${{ runner.os }}" STREQUAL "macOS")
-          set(qtc_output_directory "qtcreator/bin/Qt Creator.app/Contents/PlugIns")
+          set(qtc_output_directory "target/PlugIns")
           set(qtc_binary_name "lib$ENV{PLUGIN_NAME}.dylib")
           set(qtc_platform "mac_x64")
         endif()
@@ -159,15 +159,6 @@ jobs:
             ${CMAKE_COMMAND} -E tar xvf ../${package}.7z WORKING_DIRECTORY qtcreator)
         endforeach()
 
-        if ("${{ runner.os }}" STREQUAL "macOS")
-          execute_process(
-            COMMAND ${CMAKE_COMMAND} -E make_directory qtcreator/bin
-            COMMAND ${CMAKE_COMMAND} -E create_symlink
-              "$ENV{GITHUB_WORKSPACE}/qtcreator/Qt Creator.app"
-              "$ENV{GITHUB_WORKSPACE}/qtcreator/bin/Qt Creator.app"
-          )
-        endif()
-
     - name: Configure
       shell: cmake -P {0}
       run: |
@@ -187,14 +178,21 @@ jobs:
           endforeach()
         endif()
 
-        file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qtcreator" qtcreator_dir)
+        if ("${{ runner.os }}" STREQUAL "macOS")
+          file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qtcreator/Qt Creator.app" qtcreator_build)
+        else()
+          file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qtcreator" qtcreator_build)
+        endif()
+        file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qtcreator" qtcreator_source)
+        file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/target" target_path)
 
         execute_process(
           COMMAND ${{ steps.qt.outputs.qt_dir }}/bin/qmake
             $ENV{PLUGIN_PRO}
             CONFIG+=release
-            IDE_SOURCE_TREE="${qtcreator_dir}"
-            IDE_BUILD_TREE="${qtcreator_dir}"
+            IDE_SOURCE_TREE="${qtcreator_source}"
+            IDE_BUILD_TREE="${qtcreator_build}"
+            IDE_OUTPUT_PATH="${target_path}"
           RESULT_VARIABLE result
         )
         if (NOT result EQUAL 0)
diff --git a/plugins/haskell/haskellbuildconfiguration.cpp b/plugins/haskell/haskellbuildconfiguration.cpp
index e4e10b1..af7e147 100644
--- a/plugins/haskell/haskellbuildconfiguration.cpp
+++ b/plugins/haskell/haskellbuildconfiguration.cpp
@@ -69,7 +69,7 @@ HaskellBuildConfigurationFactory::HaskellBuildConfigurationFactory()
     });
 }
 
-HaskellBuildConfiguration::HaskellBuildConfiguration(Target *target, Core::Id id)
+HaskellBuildConfiguration::HaskellBuildConfiguration(Target *target, Utils::Id id)
     : BuildConfiguration(target, id)
 {
     setInitializer([this](const BuildInfo &info) {
diff --git a/plugins/haskell/haskellbuildconfiguration.h b/plugins/haskell/haskellbuildconfiguration.h
index 580ec2d..c93161e 100644
--- a/plugins/haskell/haskellbuildconfiguration.h
+++ b/plugins/haskell/haskellbuildconfiguration.h
@@ -42,7 +42,7 @@ class HaskellBuildConfiguration : public ProjectExplorer::BuildConfiguration
     Q_OBJECT
 
 public:
-    HaskellBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    HaskellBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
 
     ProjectExplorer::NamedWidget *createConfigWidget() override;
     BuildType buildType() const override;
diff --git a/plugins/haskell/haskellrunconfiguration.cpp b/plugins/haskell/haskellrunconfiguration.cpp
index c421571..0568606 100644
--- a/plugins/haskell/haskellrunconfiguration.cpp
+++ b/plugins/haskell/haskellrunconfiguration.cpp
@@ -53,7 +53,7 @@ HaskellExecutableAspect::HaskellExecutableAspect()
     setLabelText(tr("Executable"));
 }
 
-HaskellRunConfiguration::HaskellRunConfiguration(Target *target, Core::Id id)
+HaskellRunConfiguration::HaskellRunConfiguration(Target *target, Utils::Id id)
     : RunConfiguration(target, id)
 {
     addAspect<LocalEnvironmentAspect>(target);
diff --git a/plugins/haskell/haskellrunconfiguration.h b/plugins/haskell/haskellrunconfiguration.h
index 6ff8331..445aa3a 100644
--- a/plugins/haskell/haskellrunconfiguration.h
+++ b/plugins/haskell/haskellrunconfiguration.h
@@ -38,7 +38,7 @@ class HaskellRunConfiguration : public ProjectExplorer::RunConfiguration
     Q_OBJECT
 
 public:
-    HaskellRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    HaskellRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
 
 private:
     ProjectExplorer::Runnable runnable() const final;
diff --git a/plugins/haskell/stackbuildstep.cpp b/plugins/haskell/stackbuildstep.cpp
index c965064..a1552d6 100644
--- a/plugins/haskell/stackbuildstep.cpp
+++ b/plugins/haskell/stackbuildstep.cpp
@@ -38,7 +38,7 @@ using namespace ProjectExplorer;
 namespace Haskell {
 namespace Internal {
 
-StackBuildStep::StackBuildStep(ProjectExplorer::BuildStepList *bsl, Core::Id id)
+StackBuildStep::StackBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id)
     : AbstractProcessStep(bsl, id)
 {
     setDefaultDisplayName(trDisplayName());
diff --git a/plugins/haskell/stackbuildstep.h b/plugins/haskell/stackbuildstep.h
index 7876859..4ef55ff 100644
--- a/plugins/haskell/stackbuildstep.h
+++ b/plugins/haskell/stackbuildstep.h
@@ -35,7 +35,7 @@ class StackBuildStep : public ProjectExplorer::AbstractProcessStep
     Q_OBJECT
 
 public:
-    StackBuildStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
+    StackBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
 
     ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;