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

More Android fixes, add default android device.

Browse Source 
Switch to new android assests scheme

Change-Id: I34bf52cbb085b76df66e40391160d189301aafd2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
BogDan Vatra
2012-07-03 16:57:44 +03:00
committed by Tobias Hunger
parent 7c77331ea4
commit a16d355dce
16 changed files with 246 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ public:
unsigned partitionSize;
};
struct AndroidDevice {
struct AndroidDeviceInfo {
QString serialNumber;
QString cpuABI;
int sdk;
@@ -112,8 +112,8 @@ public:
QString getDeployDeviceSerialNumber(int *apiLevel) const;
bool createAVD(const QString &target, const QString &name, int sdcardSize) const;
bool removeAVD(const QString &name) const;
QVector<AndroidDevice> connectedDevices(int apiLevel = -1) const;
QVector<AndroidDevice> androidVirtualDevices() const;
QVector<AndroidDeviceInfo> connectedDevices(int apiLevel = -1) const;
QVector<AndroidDeviceInfo> androidVirtualDevices() const;
QString startAVD(int *apiLevel, const QString &name = QString()) const;
QString bestMatch(const QString &targetAPI) const;