From f5b92c865b196e2dbe62999ca38ba0026dd95704 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Fri, 13 Dec 2019 08:43:49 +0100
Subject: [PATCH] Android: Use Utils::InfoLabel in AndroidSdkManagerWidget

Task-number: QTCREATORBUG-23346
Change-Id: I9d9054a81567ff64b631c7c4f0541c0daac7e6dd
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
---
 src/plugins/android/androidsdkmanagerwidget.cpp |  4 +---
 src/plugins/android/androidsdkmanagerwidget.ui  | 13 +++----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/plugins/android/androidsdkmanagerwidget.cpp b/src/plugins/android/androidsdkmanagerwidget.cpp
index 391e04500ae..cb69100e681 100644
--- a/src/plugins/android/androidsdkmanagerwidget.cpp
+++ b/src/plugins/android/androidsdkmanagerwidget.cpp
@@ -76,8 +76,7 @@ AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidConfig &config,
     m_ui->setupUi(this);
     m_ui->sdkLicensebuttonBox->hide();
     m_ui->sdkLicenseLabel->hide();
-    m_ui->warningLabel->setElideMode(Qt::ElideRight);
-    m_ui->warningIconLabel->setPixmap(Utils::Icons::WARNING.pixmap());
+    m_ui->warningLabel->setType(Utils::InfoLabel::Warning);
     m_ui->viewStack->setCurrentWidget(m_ui->packagesStack);
 
     m_formatter = new Utils::OutputFormatter;
@@ -161,7 +160,6 @@ void AndroidSdkManagerWidget::setSdkManagerControlsEnabled(bool enable)
 {
     m_ui->packagesTypeGroup->setEnabled(enable);
     m_ui->expandCheck->setVisible(enable);
-    m_ui->warningIconLabel->setVisible(!enable);
     m_ui->warningLabel->setVisible(!enable);
     m_ui->packagesView->setEnabled(enable);
     m_ui->updateInstalledButton->setEnabled(enable);
diff --git a/src/plugins/android/androidsdkmanagerwidget.ui b/src/plugins/android/androidsdkmanagerwidget.ui
index 335ed19a5d9..089a39ab850 100644
--- a/src/plugins/android/androidsdkmanagerwidget.ui
+++ b/src/plugins/android/androidsdkmanagerwidget.ui
@@ -70,14 +70,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QLabel" name="warningIconLabel">
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="Utils::ElidingLabel" name="warningLabel">
+          <widget class="Utils::InfoLabel" name="warningLabel">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
@@ -294,9 +287,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>Utils::ElidingLabel</class>
+   <class>Utils::InfoLabel</class>
    <extends>QLabel</extends>
-   <header>utils/elidinglabel.h</header>
+   <header location="global">utils/infolabel.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>