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

ProjectExplorer: Make ToolChain::makeCommand return a FileName

Browse Source 
... instead of a QString. This is in line with the qmakeCommand().

Change-Id: I617cb03522be5ebaac6cab58a3606f659fddb833
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-15 10:45:36 +02:00
parent 4dd72bd899
commit 86f072daeb
21 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,11 +113,10 @@ void NimToolChain::addToEnvironment(Environment &env) const
env.prependOrSetPath(compilerCommand().parentDir().toString());
}
QString NimToolChain::makeCommand(const Environment &env) const
FileName NimToolChain::makeCommand(const Environment &env) const
{
QString make = "make";
FileName tmp = env.searchInPath(make);
return tmp.isEmpty() ? make : tmp.toString();
const FileName tmp = env.searchInPath("make");
return tmp.isEmpty() ? FileName::fromString("make") : tmp;
}
FileName NimToolChain::compilerCommand() const