diff options
| author | Daniel Teske <daniel.teske@theqtcompany.com> | 2014-11-17 16:22:28 +0100 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@theqtcompany.com> | 2014-11-18 12:05:06 +0100 |
| commit | 697b2074d3354bf5410ded5e8e0932428d892a00 (patch) | |
| tree | 5661f250c740e3419eb5c8149ad15b49cead4d0b /src/plugins/android/androidmanager.cpp | |
| parent | 613af9dca437143e7ab837ff29874fb0b70b8b07 (diff) | |
| download | qt-creator-697b2074d3354bf5410ded5e8e0932428d892a00.tar.gz | |
Android: Make Bundle Qt Deployment the default deployment method.
Debug Deployment broke with Android 5. Also show Android 5 devices
as incompatible in the device dialog if we are using debug deployment.
Task-number: QTCREATORBUG-13419
Change-Id: Ic321cfa46eb724f87f338af9c4b50face06c7c06
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@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 26f7e6d955..8a4b8563c2 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -479,7 +479,7 @@ void AndroidManager::cleanLibsOnDevice(ProjectExplorer::Target *target) if (targetArch.isEmpty()) return; int deviceAPILevel = AndroidManager::minimumSDK(target); - AndroidDeviceInfo info = AndroidConfigurations::showDeviceDialog(target->project(), deviceAPILevel, targetArch); + AndroidDeviceInfo info = AndroidConfigurations::showDeviceDialog(target->project(), deviceAPILevel, targetArch, AndroidConfigurations::None); if (info.serialNumber.isEmpty()) // aborted return; @@ -509,7 +509,7 @@ void AndroidManager::installQASIPackage(ProjectExplorer::Target *target, const Q if (targetArch.isEmpty()) return; int deviceAPILevel = AndroidManager::minimumSDK(target); - AndroidDeviceInfo info = AndroidConfigurations::showDeviceDialog(target->project(), deviceAPILevel, targetArch); + AndroidDeviceInfo info = AndroidConfigurations::showDeviceDialog(target->project(), deviceAPILevel, targetArch, AndroidConfigurations::None); if (info.serialNumber.isEmpty()) // aborted return; |