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

Android: Don't attempt to handle a non-existing qt_live_viewer.apk

Browse Source 
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>
This commit is contained in:
Alessandro Portale
2019-12-04 12:52:46 +01:00
parent 62455bea60
commit b5499f0360
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/android/androiddevice.cpp
View File

@@ -56,12 +56,14 @@ AndroidDevice::AndroidDevice()
setOsType(Utils::OsTypeOtherUnix); setOsType(Utils::OsTypeOtherUnix);
setDeviceState(DeviceReadyToUse); setDeviceState(DeviceReadyToUse);
QString activityPath;
const AndroidConfig &config = AndroidConfigurations::currentConfig(); const AndroidConfig &config = AndroidConfigurations::currentConfig();
AndroidManager::apkInfo(config.qtLiveApkPath(), nullptr, nullptr, &activityPath); if (config.qtLiveApkPath().exists()) {
qCDebug(androidDeviceLog) << "Using Qt live apk from: " << config.qtLiveApkPath() QString activityPath;
<< "Activity Path:" << activityPath; AndroidManager::apkInfo(config.qtLiveApkPath(), nullptr, nullptr, &activityPath);
setQmlsceneCommand(activityPath); qCDebug(androidDeviceLog) << "Using Qt live apk from: " << config.qtLiveApkPath()
<< "Activity Path:" << activityPath;
setQmlsceneCommand(activityPath);
}
} }
IDevice::DeviceInfo AndroidDevice::deviceInformation() const IDevice::DeviceInfo AndroidDevice::deviceInformation() const