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

Android: Give Create Avd dialog a proper parent

Browse Source 
Change-Id: I0e57d83526dff0edb435f9d81b18e22d4ee26e08
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
Daniel Teske
2013-11-21 18:09:53 +01:00
parent ee909267e0
commit cf5ec760f6
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidconfigurations.cpp
View File

@@ -496,9 +496,9 @@ QVector<AndroidDeviceInfo> AndroidConfigurations::connectedDevices(QString *erro
return devices; return devices;
} }
QString AndroidConfigurations::createAVD(int minApiLevel, QString targetArch) const QString AndroidConfigurations::createAVD(QWidget *parent, int minApiLevel, QString targetArch) const
{ {
QDialog d; QDialog d(parent);
Ui::AddNewAVDDialog avdDialog; Ui::AddNewAVDDialog avdDialog;
avdDialog.setupUi(&d); avdDialog.setupUi(&d);
// NOTE: adb list targets does actually include information on which abis are supported per apilevel // NOTE: adb list targets does actually include information on which abis are supported per apilevel

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

@@ -101,7 +101,7 @@ public:
Utils::FileName zipalignPath() const; Utils::FileName zipalignPath() const;
Utils::FileName stripPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const; Utils::FileName stripPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const;
Utils::FileName readelfPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const; Utils::FileName readelfPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const;
QString createAVD(int minApiLevel = 0, QString targetArch = QString()) const; QString createAVD(QWidget *parent, int minApiLevel = 0, QString targetArch = QString()) const;
QString createAVD(const QString &target, const QString &name, const QString &abi, int sdcardSize) const; QString createAVD(const QString &target, const QString &name, const QString &abi, int sdcardSize) const;
bool removeAVD(const QString &name) const; bool removeAVD(const QString &name) const;
QVector<AndroidDeviceInfo> connectedDevices(QString *error = 0) const; QVector<AndroidDeviceInfo> connectedDevices(QString *error = 0) const;

2
src/plugins/android/androiddevicedialog.cpp
View File

@@ -446,7 +446,7 @@ void AndroidDeviceDialog::refreshDeviceList()
void AndroidDeviceDialog::createAvd() void AndroidDeviceDialog::createAvd()
{ {
QString avd = AndroidConfigurations::instance().createAVD(m_apiLevel, m_abi); QString avd = AndroidConfigurations::instance().createAVD(this, m_apiLevel, m_abi);
if (avd.isEmpty()) if (avd.isEmpty())
return; return;
refreshDeviceList(); refreshDeviceList();

2
src/plugins/android/androidsettingswidget.cpp
View File

@@ -402,7 +402,7 @@ void AndroidSettingsWidget::browseOpenJDKLocation()
void AndroidSettingsWidget::addAVD() void AndroidSettingsWidget::addAVD()
{ {
AndroidConfigurations::instance().createAVD(); AndroidConfigurations::instance().createAVD(this);
m_AVDModel.setAvdList(AndroidConfigurations::instance().androidVirtualDevices()); m_AVDModel.setAvdList(AndroidConfigurations::instance().androidVirtualDevices());
avdActivated(m_ui->AVDTableView->currentIndex()); avdActivated(m_ui->AVDTableView->currentIndex());
} }