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

Android: remove AndroidDeviceType and State from AndroidDeviceInfo

Browse Source 
No need to have these enums which are now only a duplication of
IDevice::MachineType and IDevice::DeviceState.

Change-Id: Icc3f112f2670c7354bb282b36fad0f0631b9e047
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Assam Boudjelthia
2021-10-06 22:35:12 +03:00
parent affe3ccf51
commit ec55b1a483
9 changed files with 33 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/avdmanageroutputparser.cpp
View File

@@ -134,10 +134,10 @@ AndroidDeviceInfoList parseAvdList(const QString &output, QStringList *avdErrorP
}
} else if (Utils::optional<AndroidDeviceInfo> avd = parseAvd(avdInfo)) {
// armeabi-v7a devices can also run armeabi code
if (avd->cpuAbi.contains(ProjectExplorer::Constants::ANDROID_ABI_ARMEABI_V7A))
avd->cpuAbi << ProjectExplorer::Constants::ANDROID_ABI_ARMEABI;
avd->state = AndroidDeviceInfo::OkState;
avd->type = AndroidDeviceInfo::Emulator;
if (avd->cpuAbi.contains(Constants::ANDROID_ABI_ARMEABI_V7A))
avd->cpuAbi << Constants::ANDROID_ABI_ARMEABI;
avd->state = IDevice::DeviceConnected;
avd->type = IDevice::Emulator;
return AvdResult(*avd);
} else {
qCDebug(avdOutputParserLog) << "Avd Parsing: Parsing failed: " << avdInfo;