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

Android Deploy Options: Clean up ui

Browse Source 
Task-number: QTCREATORBUG-9208

Change-Id: I1b1864908a24af3cd7c576831656267a6390b583
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2013-05-22 17:24:15 +02:00
parent e259196593
commit d7f96e3201
8 changed files with 152 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,7 +74,9 @@ AndroidRunner::AndroidRunner(QObject *parent,
}
ProjectExplorer::Target *target = runConfig->target();
AndroidDeployStep *ds = runConfig->deployStep();
if ((m_useLocalQtLibs = ds->useLocalQtLibs())) {
m_useLocalQtLibs = ds->deployAction() == AndroidDeployStep::DeployLocal
|| ds->deployAction() == AndroidDeployStep::BundleLibraries;
if (m_useLocalQtLibs) {
m_localLibs = AndroidManager::loadLocalLibs(target, ds->deviceAPILevel());
m_localJars = AndroidManager::loadLocalJars(target, ds->deviceAPILevel());
m_localJarsInitClasses = AndroidManager::loadLocalJarsInitClasses(target, ds->deviceAPILevel());