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

Android: Use avdmanager tool

Browse Source 
android tool is deprecated since sdk tools version 25.3.0.
Use the new avdmanager tool

Task-number: QTCREATORBUG-17814
Change-Id: Id6f495f14e12d0069df08164cac1929b76d9e932
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Vikas Pachdha
2017-04-03 11:11:17 +02:00
parent 05b77e8468
commit 70be880bcb
17 changed files with 599 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,13 +42,13 @@ QT_END_NAMESPACE
namespace Android {
namespace Internal {
class AndroidToolManager;
class AndroidAvdManager;
class AvdModel: public QAbstractTableModel
{
Q_OBJECT
public:
void setAvdList(const QVector<AndroidDeviceInfo> &list);
void setAvdList(const AndroidDeviceInfoList &list);
QString avdName(const QModelIndex &index) const;
QModelIndex indexForAvdName(const QString &avdName) const;
@@ -59,7 +59,7 @@ protected:
int columnCount(const QModelIndex &parent = QModelIndex()) const;
private:
QVector<AndroidDeviceInfo> m_list;
AndroidDeviceInfoList m_list;
};
class AndroidSettingsWidget : public QWidget
@@ -116,14 +116,14 @@ private:
Ui_AndroidSettingsWidget *m_ui;
AndroidConfig m_androidConfig;
std::unique_ptr<AndroidToolManager> m_androidToolManager;
AvdModel m_AVDModel;
QFutureWatcher<AndroidConfig::CreateAvdInfo> m_futureWatcher;
QFutureWatcher<QPair<QStringList, bool>> m_checkGdbWatcher;
QStringList m_gdbCheckPaths;
QFutureWatcher<QVector<AndroidDeviceInfo>> m_virtualDevicesWatcher;
QFutureWatcher<AndroidDeviceInfoList> m_virtualDevicesWatcher;
QString m_lastAddedAvd;
std::unique_ptr<AndroidAvdManager> m_avdManager;
};
} // namespace Internal