From d1a42414c5d6ed0c3fca3d4baf0c03d50e889193 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 8 Oct 2020 14:27:49 +0300 Subject: [PATCH] Android: fix misleading warning when creating an AVD When no system images are installed in the used SDK path, the warning should point to install a system image because none are installed instead of blaming the SDK. Task-number: QTCREATORBUG-24754 Change-Id: Ic3dc6cb25f014f4216fd63636b3b312b14f76e6d Reviewed-by: Alessandro Portale Reviewed-by: Leena Miettinen --- src/plugins/android/avddialog.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp index ded445e2cb1..f4eedb2876b 100644 --- a/src/plugins/android/avddialog.cpp +++ b/src/plugins/android/avddialog.cpp @@ -244,14 +244,16 @@ void AvdDialog::updateApiLevelComboBox() if (installedSystemImages.isEmpty()) { m_avdDialog.targetApiComboBox->setEnabled(false); m_avdDialog.warningText->setVisible(true); - m_avdDialog.warningText->setText(tr("Cannot create a new AVD. No sufficiently recent Android SDK available.\n" - "Install an SDK of at least API version %1.") - .arg(m_minApiLevel)); + m_avdDialog.warningText->setText( + tr("Cannot create a new AVD. No suitable Android system image is installed.\n" + "Install a system image of at least API version %1 from the SDK Manager tab.") + .arg(m_minApiLevel)); } else if (filteredList.isEmpty()) { m_avdDialog.targetApiComboBox->setEnabled(false); m_avdDialog.warningText->setVisible(true); - m_avdDialog.warningText->setText(tr("Cannot create a AVD for ABI %1. Install an image for it.") - .arg(abi())); + m_avdDialog.warningText->setText(tr("Cannot create an AVD for ABI %1. Install a system " + "image for it from the SDK Manager tab first.") + .arg(abi())); } else { m_avdDialog.warningText->setVisible(false); m_avdDialog.targetApiComboBox->setEnabled(true);