diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2019-12-04 12:52:46 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2019-12-04 11:56:19 +0000 |
| commit | b5499f0360f4be35b32f3060e86cddeb101326d9 (patch) | |
| tree | ce536743b0d98b0186f97bd91a913dcc43a35a81 | |
| parent | 62455bea60cd2bccf151534829b43d9f7eac2491 (diff) | |
| download | qt-creator-b5499f0360f4be35b32f3060e86cddeb101326d9.tar.gz | |
Android: Don't attempt to handle a non-existing qt_live_viewer.apk
This remove 4 failed adb calls if the qt_live_viewer.apk is missing
(which it always is).
Task-number: QTCREATORBUG-23313
Change-Id: I8dbf833b35a9386d8d87f72c043dd019c62b4467
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
| -rw-r--r-- | src/plugins/android/androiddevice.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index 9b9e4d9c13..7bf6e1195b 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -56,12 +56,14 @@ AndroidDevice::AndroidDevice() setOsType(Utils::OsTypeOtherUnix); setDeviceState(DeviceReadyToUse); - QString activityPath; const AndroidConfig &config = AndroidConfigurations::currentConfig(); - AndroidManager::apkInfo(config.qtLiveApkPath(), nullptr, nullptr, &activityPath); - qCDebug(androidDeviceLog) << "Using Qt live apk from: " << config.qtLiveApkPath() - << "Activity Path:" << activityPath; - setQmlsceneCommand(activityPath); + if (config.qtLiveApkPath().exists()) { + QString activityPath; + AndroidManager::apkInfo(config.qtLiveApkPath(), nullptr, nullptr, &activityPath); + qCDebug(androidDeviceLog) << "Using Qt live apk from: " << config.qtLiveApkPath() + << "Activity Path:" << activityPath; + setQmlsceneCommand(activityPath); + } } IDevice::DeviceInfo AndroidDevice::deviceInformation() const |