diff options
| author | BogDan Vatra <bog_dan_ro@yahoo.com> | 2012-07-03 16:57:44 +0300 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-07-04 11:26:56 +0200 |
| commit | a16d355dcef20498bcbfe430d18d4b99b277440e (patch) | |
| tree | 0a2a357f790aec12cdb2b1e38a13a6cbf48fe9ac /src/plugins/android/androidsettingswidget.cpp | |
| parent | 7c77331ea4d42899a4a649c0ee66b7ab7fc10037 (diff) | |
| download | qt-creator-a16d355dcef20498bcbfe430d18d4b99b277440e.tar.gz | |
More Android fixes, add default android device.
Switch to new android assests scheme
Change-Id: I34bf52cbb085b76df66e40391160d189301aafd2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/android/androidsettingswidget.cpp')
| -rw-r--r-- | src/plugins/android/androidsettingswidget.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index ec6fca61d4..5fb4fb42d1 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -49,7 +49,7 @@ namespace Android { namespace Internal { -void AVDModel::setAvdList(QVector<AndroidDevice> list) +void AVDModel::setAvdList(QVector<AndroidDeviceInfo> list) { m_list = list; reset(); @@ -147,7 +147,6 @@ QString AndroidSettingsWidget::searchKeywords() const void AndroidSettingsWidget::initGui() { m_ui->setupUi(this); - m_ui->toolchainVersionComboBox->clear(); if (checkSDK(m_androidConfig.sdkLocation)) m_ui->SDKLocationLineEdit->setText(m_androidConfig.sdkLocation.toUserOutput()); else @@ -167,6 +166,7 @@ void AndroidSettingsWidget::initGui() m_AVDModel.setAvdList(AndroidConfigurations::instance().androidVirtualDevices()); m_ui->AVDTableView->horizontalHeader()->setResizeMode(QHeaderView::Stretch); m_ui->AVDTableView->horizontalHeader()->setResizeMode(1, QHeaderView::ResizeToContents); + fillToolchainVersions(); } void AndroidSettingsWidget::saveSettings(bool saveNow) @@ -251,9 +251,9 @@ void AndroidSettingsWidget::ndkLocationEditingFinished() void AndroidSettingsWidget::fillToolchainVersions() { - m_ui->toolchainVersionComboBox->clear(); QStringList toolchainVersions = AndroidConfigurations::instance().ndkToolchainVersions(); QString toolchain = m_androidConfig.ndkToolchainVersion; + m_ui->toolchainVersionComboBox->clear(); foreach (const QString &item, toolchainVersions) m_ui->toolchainVersionComboBox->addItem(item); if (!toolchain.isEmpty()) |