From 9264cebe24e6f26a2675bf09c0d6f5f6e534912b Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Fri, 13 Dec 2019 09:18:16 +0100
Subject: [PATCH] Android: Use Utils::InfoLabel in AvdDialog

Task-number: QTCREATORBUG-23346
Change-Id: Iabbad30f4a84d9b2b5cf16ab3e3e1e0cd05eaf8e
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
---
 src/plugins/android/addnewavddialog.ui | 27 ++++++++------------------
 src/plugins/android/avddialog.cpp      |  5 +----
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/plugins/android/addnewavddialog.ui b/src/plugins/android/addnewavddialog.ui
index b5a0ba5ec75..f1214dce082 100644
--- a/src/plugins/android/addnewavddialog.ui
+++ b/src/plugins/android/addnewavddialog.ui
@@ -56,25 +56,7 @@
       <widget class="QComboBox" name="targetComboBox"/>
      </item>
      <item row="3" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="QLabel" name="warningIcon">
-         <property name="text">
-          <string/>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="warningText">
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-      </layout>
+      <widget class="Utils::InfoLabel" name="warningText"/>
      </item>
      <item row="4" column="0">
       <widget class="QLabel" name="label_3">
@@ -132,6 +114,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>Utils::InfoLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">utils/infolabel.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>
diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp
index 29f60b506fe..40608be56f0 100644
--- a/src/plugins/android/avddialog.cpp
+++ b/src/plugins/android/avddialog.cpp
@@ -61,7 +61,7 @@ AvdDialog::AvdDialog(int minApiLevel, AndroidSdkManager *sdkManager, const QStri
     m_avdDialog.nameLineEdit->setValidator(v);
     m_avdDialog.nameLineEdit->installEventFilter(this);
 
-    m_avdDialog.warningIcon->setPixmap(Utils::Icons::WARNING.pixmap());
+    m_avdDialog.warningText->setType(Utils::InfoLabel::Warning);
 
     updateApiLevelComboBox();
 
@@ -136,18 +136,15 @@ void AvdDialog::updateApiLevelComboBox()
     }
 
     if (platforms.isEmpty()) {
-        m_avdDialog.warningIcon->setVisible(true);
         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));
     } else if (filteredList.isEmpty()) {
-        m_avdDialog.warningIcon->setVisible(true);
         m_avdDialog.warningText->setVisible(true);
         m_avdDialog.warningText->setText(tr("Cannot create a AVD for ABI %1. Install an image for it.")
                                          .arg(abi()));
     } else {
-        m_avdDialog.warningIcon->setVisible(false);
         m_avdDialog.warningText->setVisible(false);
     }
 }