diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-10-06 22:35:12 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-10-25 09:21:37 +0000 |
| commit | ec55b1a48312187d356ef1b85adf251511d0326f (patch) | |
| tree | 042bb697f1d06f550af52831a0954476be7643cb /src/plugins/android/androiddeviceinfo.cpp | |
| parent | affe3ccf510e40ee21709db581dff08089f03725 (diff) | |
| download | qt-creator-ec55b1a48312187d356ef1b85adf251511d0326f.tar.gz | |
Android: remove AndroidDeviceType and State from AndroidDeviceInfo
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>
Diffstat (limited to 'src/plugins/android/androiddeviceinfo.cpp')
| -rw-r--r-- | src/plugins/android/androiddeviceinfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/androiddeviceinfo.cpp b/src/plugins/android/androiddeviceinfo.cpp index 817f64a362..707ee3a688 100644 --- a/src/plugins/android/androiddeviceinfo.cpp +++ b/src/plugins/android/androiddeviceinfo.cpp @@ -43,7 +43,7 @@ bool AndroidDeviceInfo::operator<(const AndroidDeviceInfo &other) const if (serialNumber.contains("????") != other.serialNumber.contains("????")) return !serialNumber.contains("????"); if (type != other.type) - return type == AndroidDeviceInfo::Hardware; + return type == ProjectExplorer::IDevice::Hardware; if (sdk != other.sdk) return sdk < other.sdk; if (avdname != other.avdname) @@ -62,7 +62,7 @@ bool AndroidDeviceInfo::operator==(const AndroidDeviceInfo &other) const QDebug &operator<<(QDebug &stream, const AndroidDeviceInfo &device) { - stream << "Type:" << (device.type == AndroidDeviceInfo::Emulator ? "Emulator" : "Device") + stream << "Type:" << (device.type == ProjectExplorer::IDevice::Emulator ? "Emulator" : "Device") << ", ABI:" << device.cpuAbi << ", Serial:" << device.serialNumber << ", Name:" << device.avdname << ", API:" << device.sdk << ", Authorised:" << !device.unauthorized; |