diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-02-27 16:29:32 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-02-28 09:59:08 +0100 |
| commit | e4ce44c0187c8d5bbe4e2a374a00a88ba8a1e42b (patch) | |
| tree | dcb941f651fac2f5f7a6b1ef2d358be7387c617e /src/plugins | |
| parent | 0c0319ea8cb4e41d475b0172eaf15409da3c7fc7 (diff) | |
| download | qt-creator-e4ce44c0187c8d5bbe4e2a374a00a88ba8a1e42b.tar.gz | |
Read ANDROID_TARGET_ARCH instead of CONFIG
Instead of adding single archs like x86 to the general CONFIG
variable, we can read the ANDROID_TARGET_ARCH directly in
Qt Creator.
Change-Id: Idc4c4524d0f277aad8e129ca622d64d505a5ac95
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/android/androidpackagecreationstep.cpp | 17 | ||||
| -rw-r--r-- | src/plugins/qt4projectmanager/qt4nodes.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/qt4projectmanager/qt4nodes.h | 3 |
3 files changed, 10 insertions, 11 deletions
diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp index 5336764e4e..947fda77c9 100644 --- a/src/plugins/android/androidpackagecreationstep.cpp +++ b/src/plugins/android/androidpackagecreationstep.cpp @@ -145,16 +145,13 @@ bool AndroidPackageCreationStep::init() // Copying m_androidDir = AndroidManager::dirPath(target()); Utils::FileName path = m_androidDir; - Utils::FileName androidLibPath; - QStringList configs = project->rootQt4ProjectNode()->variableValue(Qt4ProjectManager::ConfigVar); - if (configs.contains(QLatin1String("x86"))) - androidLibPath = path.appendPath(QLatin1String("libs/x86")); - else if (configs.contains(QLatin1String("mips"))) - androidLibPath = path.appendPath(QLatin1String("libs/mips")); - else if (configs.contains(QLatin1String("armeabi-v7a"))) - androidLibPath = path.appendPath(QLatin1String("libs/armeabi-v7a")); - else - androidLibPath = path.appendPath(QLatin1String("libs/armeabi")); + QString androidTargetArch = project->rootQt4ProjectNode()->singleVariableValue(Qt4ProjectManager::AndroidArchVar); + if (androidTargetArch.isEmpty()) { + raiseError(tr("Cannot create Android package: No ANDROID_TARGET_ARCH set in make spec.")); + return false; + } + + Utils::FileName androidLibPath = path.appendPath(QLatin1String("libs/") + androidTargetArch); m_gdbServerDestination = androidLibPath.appendPath(QLatin1String("gdbserver")); m_gdbServerSource = AndroidGdbServerKitInformation::gdbServer(target()->kit()); m_debugBuild = bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild; diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index 1ba540c22c..2028a8a56f 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -1941,6 +1941,7 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async) = m_readerExact->values(QLatin1String("TARGET_VERSION_EXT")); newVarValues[StaticLibExtensionVar] = m_readerExact->values(QLatin1String("QMAKE_EXTENSION_STATICLIB")); newVarValues[ShLibExtensionVar] = m_readerExact->values(QLatin1String("QMAKE_EXTENSION_SHLIB")); + newVarValues[AndroidArchVar] = m_readerExact->values(QLatin1String("ANDROID_TARGET_ARCH")); m_isDeployable = false; if (m_projectType == ApplicationTemplate) { diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h index 7b31371b87..b3231a0e78 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.h +++ b/src/plugins/qt4projectmanager/qt4nodes.h @@ -98,7 +98,8 @@ enum Qt4Variable { VersionVar, TargetVersionExtVar, StaticLibExtensionVar, - ShLibExtensionVar + ShLibExtensionVar, + AndroidArchVar }; // Import base classes into namespace |