diff options
| author | BogDan Vatra <bogdan@kde.org> | 2013-02-16 18:05:11 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-02-20 09:32:14 +0100 |
| commit | 88ac76fb724e64d58d5af45dfdfefcdc58ae2db5 (patch) | |
| tree | ca7d37c3823bb0d4749d657ba93e68cf91541d40 /src/plugins/android/androidpackagecreationstep.cpp | |
| parent | 34692eea2ec7dcc1ad38993181a11e7328d2d88c (diff) | |
| download | qt-creator-88ac76fb724e64d58d5af45dfdfefcdc58ae2db5.tar.gz | |
Add MIPS support for Android.
Change-Id: I6b533543a998e04b3496ce2eb480bc0ee14dcbb7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/android/androidpackagecreationstep.cpp')
| -rw-r--r-- | src/plugins/android/androidpackagecreationstep.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp index 0b27ffa1b0..5336764e4e 100644 --- a/src/plugins/android/androidpackagecreationstep.cpp +++ b/src/plugins/android/androidpackagecreationstep.cpp @@ -146,10 +146,12 @@ bool AndroidPackageCreationStep::init() m_androidDir = AndroidManager::dirPath(target()); Utils::FileName path = m_androidDir; Utils::FileName androidLibPath; - if (project->rootQt4ProjectNode()->variableValue(Qt4ProjectManager::ConfigVar).contains(QLatin1String("x86"))) + QStringList configs = project->rootQt4ProjectNode()->variableValue(Qt4ProjectManager::ConfigVar); + if (configs.contains(QLatin1String("x86"))) androidLibPath = path.appendPath(QLatin1String("libs/x86")); - else if (project->rootQt4ProjectNode() - ->variableValue(Qt4ProjectManager::ConfigVar).contains(QLatin1String("armeabi-v7a"))) + 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")); |