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

Nim: Use remote device when searching compilers there

Browse Source 
Change-Id: Iab1cb1dbaaf789d2ad328ab70c3dec8839d4ffcc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-07-05 16:17:53 +02:00
parent 10ca1c711e
commit 7a6c099c08
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/nim/project/nimtoolchainfactory.cpp
View File

@@ -28,6 +28,8 @@
#include "nimconstants.h" #include "nimconstants.h"
#include "nimtoolchain.h" #include "nimtoolchain.h"
#include <projectexplorer/devicesupport/devicemanager.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
@@ -52,11 +54,10 @@ NimToolChainFactory::NimToolChainFactory()
QList<ToolChain *> NimToolChainFactory::autoDetect(const QList<ToolChain *> &alreadyKnown, QList<ToolChain *> NimToolChainFactory::autoDetect(const QList<ToolChain *> &alreadyKnown,
const IDevice::Ptr &device) const IDevice::Ptr &device)
{ {
Q_UNUSED(device);
QList<ToolChain *> result; QList<ToolChain *> result;
Environment systemEnvironment = Environment::systemEnvironment(); IDevice::ConstPtr dev = device ? device : DeviceManager::defaultDesktopDevice();
const FilePath compilerPath = systemEnvironment.searchInPath("nim"); const FilePath compilerPath = dev->searchInPath(FilePath::fromString("nim"));
if (compilerPath.isEmpty()) if (compilerPath.isEmpty())
return result; return result;

1
tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build
View File

@@ -18,5 +18,6 @@ RUN apt-get update \
g++ \ g++ \
gdb \ gdb \
ninja-build \ ninja-build \
nim \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*