From 03f6517a6a5a07fc14377f8d7c1433c9c1683869 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Tue, 16 Jun 2020 14:03:11 +0300
Subject: [PATCH] Android: use text button for openssl download instead of icon
 only

Change-Id: I37dd0076c9dad78f8e40921facfec62a7363c27c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
---
 src/plugins/android/androidsettingswidget.cpp |  1 -
 src/plugins/android/androidsettingswidget.ui  | 46 +++++++++----------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index ff1766411b1..30442612210 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -462,7 +462,6 @@ AndroidSettingsWidget::AndroidSettingsWidget()
     m_ui.downloadSDKToolButton->setIcon(downloadIcon);
     m_ui.downloadNDKToolButton->setIcon(downloadIcon);
     m_ui.downloadOpenJDKToolButton->setIcon(downloadIcon);
-    m_ui.downloadOpenSSLPrebuiltLibs->setIcon(downloadIcon);
     m_ui.sdkToolsAutoDownloadButton->setToolTip(tr(
             "Automatically download Android SDK Tools to selected location.\n\n"
             "If the selected path contains no valid SDK Tools, the SDK Tools package "
diff --git a/src/plugins/android/androidsettingswidget.ui b/src/plugins/android/androidsettingswidget.ui
index 6a5bfb95906..1ba51d59f09 100644
--- a/src/plugins/android/androidsettingswidget.ui
+++ b/src/plugins/android/androidsettingswidget.ui
@@ -239,16 +239,6 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="6">
-           <widget class="QToolButton" name="downloadNDKToolButton">
-            <property name="toolTip">
-             <string>Open Android NDK download URL in the system's browser.</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="1">
            <widget class="Utils::PathChooser" name="SDKLocationPathChooser" native="true"/>
           </item>
@@ -265,7 +255,7 @@
        <item>
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
-          <string>Android OpenSSL settings</string>
+          <string>Android OpenSSL settings (Optional)</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_2">
           <item row="0" column="0">
@@ -281,26 +271,32 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
+          <item row="1" column="0" colspan="4">
+           <widget class="Utils::DetailsWidget" name="openSslDetailsWidget" native="true"/>
+          </item>
+          <item row="0" column="3">
+           <widget class="QPushButton" name="downloadOpenSSLPrebuiltLibs">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="toolTip">
+             <string>Automatically download OpenSSL prebuilt libraries. If the automatic download fails, Qt Creator proposes to open the download URL in the system's browser for manual download.</string>
+            </property>
+            <property name="text">
+             <string>Download OpenSSL</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" colspan="2">
            <widget class="Utils::PathChooser" name="openSslPathChooser" native="true">
             <property name="toolTip">
              <string>Select the path of the prebuilt OpenSSL binaries.</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="2">
-           <widget class="QToolButton" name="downloadOpenSSLPrebuiltLibs">
-            <property name="toolTip">
-             <string>Automatically download OpenSSL prebuilt libraries. If the automatic download fails, the download URL will be opened in the system's browser for manual download.</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0" colspan="3">
-           <widget class="Utils::DetailsWidget" name="openSslDetailsWidget" native="true"/>
-          </item>
          </layout>
         </widget>
        </item>