feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

More Android fixes, add default android device.

Browse Source 
Switch to new android assests scheme

Change-Id: I34bf52cbb085b76df66e40391160d189301aafd2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
BogDan Vatra
2012-07-03 16:57:44 +03:00
committed by Tobias Hunger
parent 7c77331ea4
commit a16d355dce
16 changed files with 246 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androidpackagecreationstep.cpp
View File

@@ -161,8 +161,7 @@ bool AndroidPackageCreationStep::init()
androidLibPath = path.appendPath(QLatin1String("libs/armeabi-v7a"));
else
androidLibPath = path.appendPath(QLatin1String("libs/armeabi"));
path = m_androidDir;
m_gdbServerDestination = path.appendPath(QLatin1String("gdbserver"));
m_gdbServerDestination = androidLibPath.appendPath(QLatin1String("gdbserver"));
m_gdbServerSource = AndroidConfigurations::instance().gdbServerPath(target()->activeRunConfiguration()->abi().architecture());
m_debugBuild = bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild;