feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Nim: Fix some nimble paths

Browse Source 
Change-Id: I78a66d17931316d9baec5f2857cae12a6a62ab2c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Bernhard Beschow
2020-12-17 11:40:06 +01:00
parent f607f125f1
commit c01c69fc99
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/nim/project/nimblebuildstep.cpp
View File

@@ -38,7 +38,6 @@
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <QRegularExpression> #include <QRegularExpression>
#include <QStandardPaths>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
@@ -151,7 +150,7 @@ QString NimbleBuildStep::defaultArguments() const
void NimbleBuildStep::onArgumentsChanged() void NimbleBuildStep::onArgumentsChanged()
{ {
ProcessParameters *params = processParameters(); ProcessParameters *params = processParameters();
params->setCommandLine({QStandardPaths::findExecutable("nimble"), params->setCommandLine({Nim::nimblePathFromKit(kit()),
{"build", m_arguments->arguments(macroExpander())}}); {"build", m_arguments->arguments(macroExpander())}});
} }

3
src/plugins/nim/project/nimblebuildsystem.cpp
View File

@@ -35,7 +35,6 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QProcess> #include <QProcess>
#include <QStandardPaths>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
@@ -72,7 +71,7 @@ static NimbleMetadata parseMetadata(const QString &nimblePath, const QString &wo
{ {
QProcess process; QProcess process;
process.setWorkingDirectory(workingDirectory); process.setWorkingDirectory(workingDirectory);
process.start(QStandardPaths::findExecutable(nimblePath), {"dump"}); process.start(nimblePath, {"dump"});
process.waitForFinished(); process.waitForFinished();
NimbleMetadata result = {}; NimbleMetadata result = {};