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

10
src/plugins/android/androiddeviceinfo.h
View File

@@ -30,6 +30,10 @@
#include <QString>
#include <QStringList>
#include <projectexplorer/devicesupport/idevice.h>
using namespace ProjectExplorer;
namespace Android {
class AndroidDeviceInfo
@@ -44,11 +48,9 @@ public:
QString avdSdcardSize;
int sdk = -1;
enum State { OkState, UnAuthorizedState, OfflineState };
State state = OfflineState;
IDevice::DeviceState state = IDevice::DeviceDisconnected;
bool unauthorized = false;
enum AndroidDeviceType { Hardware, Emulator };
AndroidDeviceType type = Emulator;
IDevice::MachineType type = IDevice::Emulator;
static QStringList adbSelector(const QString &serialNumber);