From cf5ec760f61522ce0387b5ea44b017459c200ab8 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Thu, 21 Nov 2013 18:09:53 +0100 Subject: Android: Give Create Avd dialog a proper parent Change-Id: I0e57d83526dff0edb435f9d81b18e22d4ee26e08 Reviewed-by: Robert Loehning --- src/plugins/android/androidconfigurations.cpp | 4 ++-- src/plugins/android/androidconfigurations.h | 2 +- src/plugins/android/androiddevicedialog.cpp | 2 +- src/plugins/android/androidsettingswidget.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index e5a282e220..f3cf89e562 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -496,9 +496,9 @@ QVector AndroidConfigurations::connectedDevices(QString *erro 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; avdDialog.setupUi(&d); // NOTE: adb list targets does actually include information on which abis are supported per apilevel diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 0ffd279c14..1d87f5b27d 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -101,7 +101,7 @@ public: Utils::FileName zipalignPath() const; Utils::FileName stripPath(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; bool removeAVD(const QString &name) const; QVector connectedDevices(QString *error = 0) const; diff --git a/src/plugins/android/androiddevicedialog.cpp b/src/plugins/android/androiddevicedialog.cpp index 66f4c1ea98..6b3fb90bd5 100644 --- a/src/plugins/android/androiddevicedialog.cpp +++ b/src/plugins/android/androiddevicedialog.cpp @@ -446,7 +446,7 @@ void AndroidDeviceDialog::refreshDeviceList() 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()) return; refreshDeviceList(); diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index e533894421..4ab8228d0b 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -402,7 +402,7 @@ void AndroidSettingsWidget::browseOpenJDKLocation() void AndroidSettingsWidget::addAVD() { - AndroidConfigurations::instance().createAVD(); + AndroidConfigurations::instance().createAVD(this); m_AVDModel.setAvdList(AndroidConfigurations::instance().androidVirtualDevices()); avdActivated(m_ui->AVDTableView->currentIndex()); } -- cgit v1.2.1