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

Merge remote-tracking branch 'origin/2.7' into 2.8

Browse Source
This commit is contained in:
Eike Ziller
2013-05-23 07:25:34 +02:00
parent 24ee641543 35b96f2fc1
commit ef5d3796d5
84 changed files with 2283 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,9 +200,17 @@ QList<FileName> AndroidToolChain::suggestedMkspecList() const
QString AndroidToolChain::makeCommand(const Utils::Environment &env) const
{
QString make = HostOsInfo::isWindowsHost()
? QLatin1String("ma-make.exe") : QLatin1String("make");
QString tmp = env.searchInPath(make);
QStringList extraDirectories = AndroidConfigurations::instance().makeExtraSearchDirectories();
if (HostOsInfo::isWindowsHost()) {
QString tmp = env.searchInPath(QLatin1String("ma-make.exe"), extraDirectories);
if (!tmp.isEmpty())
return tmp;
tmp = env.searchInPath(QLatin1String("mingw32-make"), extraDirectories);
return tmp.isEmpty() ? QLatin1String("mingw32-make") : tmp;
}
QString make = QLatin1String("make");
QString tmp = env.searchInPath(make, extraDirectories);
return tmp.isEmpty() ? make : tmp;
}