diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-05-30 13:48:27 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-05-30 13:48:27 +0200 |
| commit | 0a95b28147d9c4ea57ba9b025beec2d503399acf (patch) | |
| tree | 9032878c4c1b3877167990376d3871db70eb304c /src/plugins/android/androidrunner.cpp | |
| parent | cca4cbfb02da327c844c1291d43a8f7f6420e334 (diff) | |
| parent | 10d7d61e263573116965b1af53cdbda0f668211d (diff) | |
| download | qt-creator-0a95b28147d9c4ea57ba9b025beec2d503399acf.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
Diffstat (limited to 'src/plugins/android/androidrunner.cpp')
| -rw-r--r-- | src/plugins/android/androidrunner.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index 471c380f3b..a005e10fde 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()); |