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

Make Toolchain::makeCommand return a full path to the make command

Browse Source 
Requires passing in the environment to use. Also now the mingw toolchain
has a fall back to make.exe on windows. And the msvc toolchain falls
back to nmake even if the "use Jom" option is used.

Task-number: QTCREATORBUG-7831

Change-Id: I850a96da41a380eef8c6992e27a72fb63958c456
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
This commit is contained in:
Daniel Teske
2012-09-11 15:59:17 +02:00
parent f89352d7a8
commit d3c0557444
14 changed files with 89 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidtoolchain.cpp
View File

@@ -152,13 +152,15 @@ QList<Utils::FileName> AndroidToolChain::suggestedMkspecList() const
return QList<Utils::FileName>()<< Utils::FileName::fromString(QLatin1String("android-g++"));
}
QString AndroidToolChain::makeCommand() const
QString AndroidToolChain::makeCommand(const Utils::Environment &env) const
{
#if defined(Q_OS_WIN)
return QLatin1String("ma-make.exe");
QString make = QLatin1String("ma-make.exe");
#else
return QLatin1String("make");
QString make = QLatin1String("make");
#endif
QString tmp = env.searchInPath(make);
return tmp.isEmpty() ? make : tmp;
}
void AndroidToolChain::setQtVersionId(int id)