diff options
| author | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-01-27 18:46:40 +0100 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-02-13 15:35:35 +0000 |
| commit | e7b90b8681f68a889f2da601b42b001111aaef43 (patch) | |
| tree | 227fe1d655553ada4cfe7cca48852a27d6932a93 /src/plugins/android/androidmanager.cpp | |
| parent | 5442d144b65efd873e851f540512c2c19c010cba (diff) | |
| download | qt-creator-e7b90b8681f68a889f2da601b42b001111aaef43.tar.gz | |
Android: Set correct ANDROID_NDK_PLATFORM
Introduce the class AndroidQmakeBuildConfiguration whose purpose is
to set the environment variable. Modify the Factory to create
buildconfigurations of that type and fix restore/clone to also
take the factories' priorities into account.
Change-Id: Icb377fa9211cd3564c36b60cf7c5f7dd84fcab50
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/plugins/android/androidmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index c80f56d5ed..b5ad731b66 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -149,7 +149,7 @@ QString AndroidManager::activityName(ProjectExplorer::Target *target) int AndroidManager::minimumSDK(ProjectExplorer::Target *target) { QDomDocument doc; - if (!openManifest(target, doc)) + if (!openXmlFile(doc, AndroidManager::manifestSourcePath(target))) return 0; QDomElement manifestElem = doc.documentElement(); QDomElement usesSdk = manifestElem.firstChildElement(QLatin1String("uses-sdk")); @@ -192,7 +192,18 @@ QString AndroidManager::targetArch(ProjectExplorer::Target *target) Utils::FileName AndroidManager::dirPath(ProjectExplorer::Target *target) { - return target->activeBuildConfiguration()->buildDirectory().appendPath(QLatin1String(Constants::ANDROID_BUILDDIRECTORY)); + if (target->activeBuildConfiguration()) + return target->activeBuildConfiguration()->buildDirectory().appendPath(QLatin1String(Constants::ANDROID_BUILDDIRECTORY)); + return Utils::FileName(); +} + +Utils::FileName AndroidManager::manifestSourcePath(ProjectExplorer::Target *target) +{ + AndroidQtSupport *androidQtSupport = AndroidManager::androidQtSupport(target); + Utils::FileName source = androidQtSupport->manifestSourcePath(target); + if (!source.isEmpty()) + return source; + return manifestPath(target); } Utils::FileName AndroidManager::manifestPath(ProjectExplorer::Target *target) |