aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/nim
diff options
context:
space:
mode:
authorBernhard Beschow <shentey@gmail.com>2020-12-17 11:40:06 +0100
committerBernhard Beschow <shentey@gmail.com>2021-01-04 12:08:58 +0000
commitc01c69fc99c6f2602de6b4cc199a44c9001807af (patch)
tree92f538ef20446dea46609ff3b12bad91ea1c5f73 /src/plugins/nim
parentf607f125f1b992a78130b70e7f7635b73a85b02d (diff)
Nim: Fix some nimble paths
Change-Id: I78a66d17931316d9baec5f2857cae12a6a62ab2c Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/nim')
-rw-r--r--src/plugins/nim/project/nimblebuildstep.cpp3
-rw-r--r--src/plugins/nim/project/nimblebuildsystem.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/nim/project/nimblebuildstep.cpp b/src/plugins/nim/project/nimblebuildstep.cpp
index 27f72adb82..ddbd93305c 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 7090bfabc4..7e0fc582f7 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 = {};