diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2013-05-16 15:49:24 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2013-05-21 11:40:36 +0200 |
| commit | 889740a90f79af302d193008cda4324e7368557c (patch) | |
| tree | 89d7097601f9a26b144bf91bf654a2d79b6be424 /src/plugins/android/androidtoolchain.cpp | |
| parent | 4bb73adad6e510e7c7db6df3d3c622c4c6baa6d3 (diff) | |
| download | qt-creator-889740a90f79af302d193008cda4324e7368557c.tar.gz | |
Android: Extra search directory to find make on windows
The sdk should set that extra directory, via the sdktool.
E. g. something like
sdktool addKeys android MakeExtraSearchDirectory QString:%DIRECTORY%
where %DIRECTORY% is the bin directory of the bundled mingw.
That is Tools\MinGW\bin for the qt sdk.
Also see:
Task-number: QTCREATORBUG-9297
Change-Id: I487c67b7fb704dd00cf5c6f4f647c8c4fbe8cd3d
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/plugins/android/androidtoolchain.cpp')
| -rw-r--r-- | src/plugins/android/androidtoolchain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index 04ee758640..65bd22393a 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -204,7 +204,7 @@ QString AndroidToolChain::makeCommand(const Utils::Environment &env) const { QString make = HostOsInfo::isWindowsHost() ? QLatin1String("ma-make.exe") : QLatin1String("make"); - QString tmp = env.searchInPath(make); + QString tmp = env.searchInPath(make, AndroidConfigurations::instance().makeExtraSearchDirectories()); return tmp.isEmpty() ? make : tmp; } |