From c01c69fc99c6f2602de6b4cc199a44c9001807af Mon Sep 17 00:00:00 2001
From: Bernhard Beschow <shentey@gmail.com>
Date: Thu, 17 Dec 2020 11:40:06 +0100
Subject: [PATCH] Nim: Fix some nimble paths

Change-Id: I78a66d17931316d9baec5f2857cae12a6a62ab2c
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/nim/project/nimblebuildstep.cpp   | 3 +--
 src/plugins/nim/project/nimblebuildsystem.cpp | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/plugins/nim/project/nimblebuildstep.cpp b/src/plugins/nim/project/nimblebuildstep.cpp
index 27f72adb82c..ddbd93305ce 100644
--- a/src/plugins/nim/project/nimblebuildstep.cpp
+++ b/src/plugins/nim/project/nimblebuildstep.cpp
@@ -38,7 +38,6 @@
 #include <projectexplorer/target.h>
 
 #include <QRegularExpression>
-#include <QStandardPaths>
 
 using namespace ProjectExplorer;
 using namespace Utils;
@@ -151,7 +150,7 @@ QString NimbleBuildStep::defaultArguments() const
 void NimbleBuildStep::onArgumentsChanged()
 {
     ProcessParameters *params = processParameters();
-    params->setCommandLine({QStandardPaths::findExecutable("nimble"),
+    params->setCommandLine({Nim::nimblePathFromKit(kit()),
                             {"build", m_arguments->arguments(macroExpander())}});
 }
 
diff --git a/src/plugins/nim/project/nimblebuildsystem.cpp b/src/plugins/nim/project/nimblebuildsystem.cpp
index 7090bfabc41..7e0fc582f70 100644
--- a/src/plugins/nim/project/nimblebuildsystem.cpp
+++ b/src/plugins/nim/project/nimblebuildsystem.cpp
@@ -35,7 +35,6 @@
 #include <utils/qtcassert.h>
 
 #include <QProcess>
-#include <QStandardPaths>
 
 using namespace ProjectExplorer;
 using namespace Utils;
@@ -72,7 +71,7 @@ static NimbleMetadata parseMetadata(const QString &nimblePath, const QString &wo
 {
     QProcess process;
     process.setWorkingDirectory(workingDirectory);
-    process.start(QStandardPaths::findExecutable(nimblePath), {"dump"});
+    process.start(nimblePath, {"dump"});
     process.waitForFinished();
 
     NimbleMetadata result = {};