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

Android: Fix blocking the ui on adding an avd

Browse Source 
Task-number: QTCREATORBUG-10601
Change-Id: I3d1fef8a44f434f7eb484f538863c436b4e3a21c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Daniel Teske
2014-04-11 13:31:01 +02:00
parent acfe2a2771
commit 7a91287c80
6 changed files with 111 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@
#include <QString>
#include <QWidget>
#include <QAbstractTableModel>
#include <QFutureWatcher>
QT_BEGIN_NAMESPACE
class Ui_AndroidSettingsWidget;
@@ -50,6 +51,7 @@ class AvdModel: public QAbstractTableModel
public:
void setAvdList(const QVector<AndroidDeviceInfo> &list);
QString avdName(const QModelIndex &index) const;
QModelIndex indexForAvdName(const QString &avdName) const;
protected:
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
@@ -86,6 +88,7 @@ private slots:
void openAntDownloadUrl();
void openOpenJDKDownloadUrl();
void addAVD();
void avdAdded();
void removeAVD();
void startAVD();
void avdActivated(QModelIndex);
@@ -111,6 +114,7 @@ private:
Ui_AndroidSettingsWidget *m_ui;
AndroidConfig m_androidConfig;
AvdModel m_AVDModel;
QFutureWatcher<AndroidConfig::CreateAvdInfo> m_futureWatcher;
};
} // namespace Internal