diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2013-10-17 13:12:45 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2013-10-18 13:09:22 +0200 |
| commit | 723d4a973f26bf723f5c95949b8b489100118206 (patch) | |
| tree | a4a9010c242fcca7e14319c66add2dacd9f61f76 /src/plugins/android/androidqtversion.cpp | |
| parent | 5e10114e76049461cbe19ce5e7131ed211da1c1c (diff) | |
| download | qt-creator-723d4a973f26bf723f5c95949b8b489100118206.tar.gz | |
Android: Distinguish between platforms in the ndk and the sdk
The available platforms in the ndk might not be the same as in the sdk.
This patch is renames everything using the ndk platform list to
ndkPlatforms, except the highestAvailablePlatform which wrongly uses
the ndk platform list.
Change-Id: I02d9b68bbc27b0c748281678fe654d5f4244578d
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/plugins/android/androidqtversion.cpp')
| -rw-r--r-- | src/plugins/android/androidqtversion.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index b31af28d3c..6298812797 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -122,8 +122,7 @@ void AndroidQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils::En return; env.set(QLatin1String("ANDROID_NDK_PLATFORM"), - AndroidConfigurations::instance().bestMatch(AndroidManager::buildTargetSDK(target))); - + AndroidConfigurations::instance().bestNdkPlatformMatch(AndroidManager::buildTargetSDK(target))); } QString AndroidQtVersion::description() const |