aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android/androidrunner.cpp
diff options
context:
space:
mode:
authorDaniel Teske <[email protected]>2013-05-22 17:24:15 +0200
committerDaniel Teske <[email protected]>2013-05-29 15:15:56 +0200
commitd7f96e3201ed8c2fd769caf7f6d6937a970c628e (patch)
tree95355fa599f52d88bc5e6c5f30583665f3843558 /src/plugins/android/androidrunner.cpp
parente2591965938b83aa8c27daf090a2b2a2f746df57 (diff)
Android Deploy Options: Clean up ui
Task-number: QTCREATORBUG-9208 Change-Id: I1b1864908a24af3cd7c576831656267a6390b583 Reviewed-by: BogDan Vatra <[email protected]>
Diffstat (limited to 'src/plugins/android/androidrunner.cpp')
-rw-r--r--src/plugins/android/androidrunner.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index 471c380f3bc..a005e10fde6 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -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());