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

Android: Clean up AndroidDeviceInfo

Browse Source 
Turn it into a class, add a isValid method and initialize it properly

Change-Id: I413ca931b125c9bbfc58b855280e9e58402f3d0b
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-11-13 12:53:09 +01:00
parent d2bb143552
commit 8e55ee6377
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/android/androidconfigurations.h
View File

@@ -57,19 +57,22 @@ namespace Utils { class Environment; }
namespace Android { namespace Android {
class AndroidPlugin; class AndroidPlugin;
struct AndroidDeviceInfo class AndroidDeviceInfo
{ {
public:
QString serialNumber; QString serialNumber;
QString avdname; QString avdname;
QStringList cpuAbi; QStringList cpuAbi;
int sdk; int sdk = -1;
enum State { OkState, UnAuthorizedState, OfflineState }; enum State { OkState, UnAuthorizedState, OfflineState };
State state; State state = OfflineState;
bool unauthorized; bool unauthorized = false;
enum AndroidDeviceType { Hardware, Emulator }; enum AndroidDeviceType { Hardware, Emulator };
AndroidDeviceType type; AndroidDeviceType type = Emulator;
static QStringList adbSelector(const QString &serialNumber); static QStringList adbSelector(const QString &serialNumber);
bool isValid() { return !serialNumber.isEmpty() && !avdname.isEmpty(); }
}; };
class SdkPlatform class SdkPlatform