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

Nim: Fix running when building with nimble

Browse Source 
Change-Id: I62b2eebf408119a19f0e98958e3132c16c9c6aa5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Stenger
2020-08-31 14:28:10 +02:00
committed by hjk
parent 79010891e1
commit 158ac2d339
5 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,8 @@
****************************************************************************/
#include "nimblebuildsystem.h"
#include "nimbuildsystem.h"
#include "nimbleproject.h"
#include "nimproject.h"
@@ -46,7 +48,7 @@ static std::vector<NimbleTask> parseTasks(const QString &nimblePath, const QStri
{
QProcess process;
process.setWorkingDirectory(workingDirectory);
process.start(QStandardPaths::findExecutable(nimblePath), {"tasks"});
process.start(nimblePath, {"tasks"});
process.waitForFinished();
std::vector<NimbleTask> result;
@@ -145,8 +147,9 @@ void NimbleBuildSystem::triggerParsing()
void NimbleBuildSystem::updateProject()
{
const FilePath projectDir = projectDirectory();
const FilePath nimble = Nim::nimblePathFromKit(kit());
m_metadata = parseMetadata(QStandardPaths::findExecutable("nimble"), projectDir.toString());
m_metadata = parseMetadata(nimble.toString(), projectDir.toString());
const FilePath binDir = projectDir.pathAppended(m_metadata.binDir);
const FilePath srcDir = projectDir.pathAppended("src");
@@ -162,7 +165,7 @@ void NimbleBuildSystem::updateProject()
setApplicationTargets(std::move(targets));
std::vector<NimbleTask> tasks = parseTasks(QStandardPaths::findExecutable("nimble"), projectDir.toString());
std::vector<NimbleTask> tasks = parseTasks(nimble.toString(), projectDir.toString());
if (tasks != m_tasks) {
m_tasks = std::move(tasks);
emit tasksChanged();