summaryrefslogtreecommitdiff
path: root/src/plugins/android/androidpackagecreationstep.cpp
diff options
context:
space:
mode:
authorBogDan Vatra <bog_dan_ro@yahoo.com>2012-06-23 12:24:44 +0300
committerTobias Hunger <tobias.hunger@nokia.com>2012-06-23 11:53:33 +0200
commitbb0573a8aa8257ea1175d2a44d2207d8ea01837a (patch)
tree83356d0dec37b10f4afd718011c0b637aaacbef3 /src/plugins/android/androidpackagecreationstep.cpp
parenta1d4afad676f596280cf9f59fc765c3990051603 (diff)
downloadqt-creator-bb0573a8aa8257ea1175d2a44d2207d8ea01837a.tar.gz
Fix Android plugin.
Change-Id: I56533be94fc868d04bd1d289ff9d3c381391d41b Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/android/androidpackagecreationstep.cpp')
-rw-r--r--src/plugins/android/androidpackagecreationstep.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp
index dccfe9423b..293201a8ec 100644
--- a/src/plugins/android/androidpackagecreationstep.cpp
+++ b/src/plugins/android/androidpackagecreationstep.cpp
@@ -152,15 +152,17 @@ bool AndroidPackageCreationStep::init()
// Copying
m_androidDir = AndroidManager::dirPath(target());
+ Utils::FileName path = m_androidDir;
Utils::FileName androidLibPath;
if (project->rootQt4ProjectNode()->variableValue(Qt4ProjectManager::ConfigVar).contains(QLatin1String("x86")))
- androidLibPath = m_androidDir.appendPath(QLatin1String("libs/x86"));
+ androidLibPath = path.appendPath(QLatin1String("libs/x86"));
else if (project->rootQt4ProjectNode()
->variableValue(Qt4ProjectManager::ConfigVar).contains(QLatin1String("armeabi-v7a")))
- androidLibPath = m_androidDir.appendPath(QLatin1String("libs/armeabi-v7a"));
+ androidLibPath = path.appendPath(QLatin1String("libs/armeabi-v7a"));
else
- androidLibPath = m_androidDir.appendPath(QLatin1String("libs/armeabi"));
- m_gdbServerDestination = androidLibPath.appendPath(QLatin1String("gdbserver"));
+ androidLibPath = path.appendPath(QLatin1String("libs/armeabi"));
+ path = m_androidDir;
+ m_gdbServerDestination = path.appendPath(QLatin1String("gdbserver"));
m_gdbServerSource = AndroidConfigurations::instance().gdbServerPath(target()->activeRunConfiguration()->abi().architecture());
m_debugBuild = bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild;