Android: Clean up AndroidDeviceInfo

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

View File

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