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

10
src/plugins/android/androidmanager.cpp
View File

@@ -319,8 +319,7 @@ bool AndroidManager::bundleQt(ProjectExplorer::Target *target)
AndroidRunConfiguration *androidRunConfiguration = qobject_cast<AndroidRunConfiguration *>(runConfiguration);
if (androidRunConfiguration != 0) {
AndroidDeployStep *deployStep = androidRunConfiguration->deployStep();
return deployStep->deployAction() == AndroidDeployStep::NoDeploy
&& deployStep->useLocalQtLibs();
return deployStep->deployAction() == AndroidDeployStep::BundleLibraries;
}
return false;
@@ -340,9 +339,10 @@ bool AndroidManager::updateDeploymentSettings(ProjectExplorer::Target *target)
return false;
AndroidDeployStep *deployStep = androidRunConfiguration->deployStep();
bool useLocalLibs = deployStep->useLocalQtLibs();
bool deployQtLibs = deployStep->deployAction() != AndroidDeployStep::NoDeploy;
bool bundleQtLibs = useLocalLibs && !deployQtLibs;
AndroidDeployStep::AndroidDeployAction deployAction = deployStep->deployAction();
bool useLocalLibs = deployAction == AndroidDeployStep::DeployLocal
|| deployAction == AndroidDeployStep::BundleLibraries;
bool bundleQtLibs = deployAction == AndroidDeployStep::BundleLibraries;
QDomDocument doc;
if (!openManifest(target, doc))