diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2015-12-04 10:03:45 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2015-12-10 10:47:31 +0000 |
| commit | 957c0af5705ef1b5affad7c4e130b4bd5b14044f (patch) | |
| tree | b12692d6840ae9d39ed5328607f25b38bd4e855d /src/plugins/android/androidmanager.cpp | |
| parent | 255611f3e798b7b25744f0215fb898a4aa7519c2 (diff) | |
| download | qt-creator-957c0af5705ef1b5affad7c4e130b4bd5b14044f.tar.gz | |
Immediately return the default device if is found
Task-number: QTCREATORBUG-15422
Change-Id: I7be44fbe43c320c171ffb724ffd25414e184fd9a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/android/androidmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index cff67ce283..86a6a3ade5 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -307,7 +307,7 @@ void AndroidManager::cleanLibsOnDevice(ProjectExplorer::Target *target) return; const int deviceAPILevel = AndroidManager::minimumSDK(target); AndroidDeviceInfo info = AndroidConfigurations::showDeviceDialog(target->project(), deviceAPILevel, targetArch, AndroidConfigurations::None); - if (info.serialNumber.isEmpty() && info.avdname.isEmpty()) // aborted + if (!info.isValid()) // aborted return; QString deviceSerialNumber = info.serialNumber; @@ -336,7 +336,7 @@ void AndroidManager::installQASIPackage(ProjectExplorer::Target *target, const Q return; const int deviceAPILevel = AndroidManager::minimumSDK(target); AndroidDeviceInfo info = AndroidConfigurations::showDeviceDialog(target->project(), deviceAPILevel, targetArch, AndroidConfigurations::None); - if (info.serialNumber.isEmpty() && info.avdname.isEmpty()) // aborted + if (!info.isValid()) // aborted return; QString deviceSerialNumber = info.serialNumber; |