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

AndroidDeviceDialog: Move default device selection into Dialog

Browse Source 
Change-Id: Ib4a272eba1f1521c082ec519ef016ad5969eb527
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-04-29 15:21:37 +02:00
parent 828360d87a
commit fa401b8fab
4 changed files with 174 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androiddevicedialog.h
View File

@@ -36,6 +36,7 @@
#include <QVector>
#include <QDialog>
#include <QFutureWatcher>
#include <QTime>
QT_BEGIN_NAMESPACE
class QModelIndex;
@@ -54,7 +55,8 @@ class AndroidDeviceDialog : public QDialog
Q_OBJECT
public:
explicit AndroidDeviceDialog(int apiLevel, const QString &abi, AndroidConfigurations::Options opts, QWidget *parent = 0);
explicit AndroidDeviceDialog(int apiLevel, const QString &abi, AndroidConfigurations::Options opts,
const QString &serialNumber, QWidget *parent = 0);
~AndroidDeviceDialog();
AndroidDeviceInfo device();
@@ -74,6 +76,8 @@ private:
const Utils::Environment &environment);
void devicesRefreshed();
void enableOkayButton();
void useDefaultDevice();
void defaultDeviceClear();
AndroidDeviceModel *m_model;
Ui::AndroidDeviceDialog *m_ui;
@@ -81,6 +85,8 @@ private:
int m_apiLevel;
QString m_abi;
QString m_avdNameFromAdd;
QString m_defaultDevice;
QTime m_defaultDeviceTimer;
QFutureWatcher<AndroidConfig::CreateAvdInfo> m_futureWatcherAddDevice;
QFutureWatcher<QVector<AndroidDeviceInfo>> m_futureWatcherRefreshDevices;
};