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

Android: androiddeployqt support

Browse Source 
Change-Id: I37d706b4e11c6e1353a8ee73378b7d080080678c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Daniel Teske
2013-09-17 18:24:57 +02:00
parent 455d597ac3
commit 1262310798
30 changed files with 1876 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/android/androidrunner.cpp
View File

@@ -30,6 +30,7 @@
#include "androidrunner.h"
#include "androiddeploystep.h"
#include "androiddeployqtstep.h"
#include "androidconfigurations.h"
#include "androidglobal.h"
#include "androidrunconfiguration.h"
@@ -73,17 +74,17 @@ AndroidRunner::AndroidRunner(QObject *parent,
m_qmlPort = server.serverPort();
}
ProjectExplorer::Target *target = runConfig->target();
AndroidDeployStep *ds = runConfig->deployStep();
m_useLocalQtLibs = ds->deployAction() == AndroidDeployStep::DeployLocal
|| ds->deployAction() == AndroidDeployStep::BundleLibraries;
m_useLocalQtLibs = AndroidManager::useLocalLibs(target);
if (m_useLocalQtLibs) {
m_localLibs = AndroidManager::loadLocalLibs(target, ds->deviceAPILevel());
m_localJars = AndroidManager::loadLocalJars(target, ds->deviceAPILevel());
m_localJarsInitClasses = AndroidManager::loadLocalJarsInitClasses(target, ds->deviceAPILevel());
int deviceApiLevel = AndroidManager::minimumSDK(target);
m_localLibs = AndroidManager::loadLocalLibs(target, deviceApiLevel);
m_localJars = AndroidManager::loadLocalJars(target, deviceApiLevel);
m_localJarsInitClasses = AndroidManager::loadLocalJarsInitClasses(target, deviceApiLevel);
}
m_intentName = AndroidManager::intentName(target);
m_packageName = m_intentName.left(m_intentName.indexOf(QLatin1Char('/')));
m_deviceSerialNumber = ds->deviceSerialNumber();
m_deviceSerialNumber = AndroidManager::deviceSerialNumber(target);
m_processPID = -1;
m_adb = AndroidConfigurations::instance().adbToolPath().toString();
m_selector = AndroidDeviceInfo::adbSelector(m_deviceSerialNumber);