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

Android: Remove unneeded variable assignments.

Browse Source 
Change-Id: Ib00dfd415ca380039648d3c8333f7ff1c49ad9ec
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Christian Kandeler
2015-06-10 10:34:03 +02:00
parent bac4667497
commit 9b0abb2489
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -493,12 +493,11 @@ void AndroidManager::cleanLibsOnDevice(ProjectExplorer::Target *target)
const QString targetArch = AndroidManager::targetArch(target); const QString targetArch = AndroidManager::targetArch(target);
if (targetArch.isEmpty()) if (targetArch.isEmpty())
return; return;
int deviceAPILevel = AndroidManager::minimumSDK(target); const int deviceAPILevel = AndroidManager::minimumSDK(target);
AndroidDeviceInfo info = AndroidConfigurations::showDeviceDialog(target->project(), deviceAPILevel, targetArch, AndroidConfigurations::None); AndroidDeviceInfo info = AndroidConfigurations::showDeviceDialog(target->project(), deviceAPILevel, targetArch, AndroidConfigurations::None);
if (info.serialNumber.isEmpty() && info.avdname.isEmpty()) // aborted if (info.serialNumber.isEmpty() && info.avdname.isEmpty()) // aborted
return; return;
deviceAPILevel = info.sdk;
QString deviceSerialNumber = info.serialNumber; QString deviceSerialNumber = info.serialNumber;
if (info.type == AndroidDeviceInfo::Emulator) { if (info.type == AndroidDeviceInfo::Emulator) {
@@ -523,12 +522,11 @@ void AndroidManager::installQASIPackage(ProjectExplorer::Target *target, const Q
const QString targetArch = AndroidManager::targetArch(target); const QString targetArch = AndroidManager::targetArch(target);
if (targetArch.isEmpty()) if (targetArch.isEmpty())
return; return;
int deviceAPILevel = AndroidManager::minimumSDK(target); const int deviceAPILevel = AndroidManager::minimumSDK(target);
AndroidDeviceInfo info = AndroidConfigurations::showDeviceDialog(target->project(), deviceAPILevel, targetArch, AndroidConfigurations::None); AndroidDeviceInfo info = AndroidConfigurations::showDeviceDialog(target->project(), deviceAPILevel, targetArch, AndroidConfigurations::None);
if (info.serialNumber.isEmpty() && info.avdname.isEmpty()) // aborted if (info.serialNumber.isEmpty() && info.avdname.isEmpty()) // aborted
return; return;
deviceAPILevel = info.sdk;
QString deviceSerialNumber = info.serialNumber; QString deviceSerialNumber = info.serialNumber;
if (info.type == AndroidDeviceInfo::Emulator) { if (info.type == AndroidDeviceInfo::Emulator) {
deviceSerialNumber = AndroidConfigurations::currentConfig().startAVD(info.avdname); deviceSerialNumber = AndroidConfigurations::currentConfig().startAVD(info.avdname);