Android: Fix Abi of qt versions

Change-Id: I441e6e29305eb082a8d713ab9d26b7fce419a509
Reviewed-by: BogDan Vatra <bogdan@kde.org>

src/plugins/android/androidconfigurations.cpp

@@ -573,6 +573,8 @@ void AndroidConfigurations::updateAutomaticKitList()
             continue;
         if (!k->isAutoDetected())
             continue;
+        if (k->isSdkProvided())
+            continue;
         ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain((k));
         if (!tc)
             continue;
@@ -604,6 +606,7 @@ void AndroidConfigurations::updateAutomaticKitList()
                                    .arg(arch)
                                    .arg(tc->ndkToolChainVersion())
                                    .arg(qt->qtVersionString()));
+            newKit->setIconPath(QLatin1String(Constants::ANDROID_SETTINGS_CATEGORY_ICON));
             DeviceTypeKitInformation::setDeviceTypeId(newKit, Core::Id(Constants::ANDROID_DEVICE_TYPE));
             ToolChainKitInformation::setToolChain(newKit, tc);
             QtSupport::QtKitInformation::setQtVersion(newKit, qt);

src/plugins/android/androidqtversion.cpp

@@ -89,9 +89,15 @@ QString AndroidQtVersion::invalidReason() const
 
 QList<ProjectExplorer::Abi> AndroidQtVersion::detectQtAbis() const
 {
-    return QList<ProjectExplorer::Abi>() << ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::LinuxOS,
-                                                                 ProjectExplorer::Abi::AndroidLinuxFlavor, ProjectExplorer::Abi::ElfFormat,
-                                                                 32);
+    QList<ProjectExplorer::Abi> abis = qtAbisFromLibrary(qtCorePath(versionInfo(), qtVersionString()));
+    for (int i = 0; i < abis.count(); ++i) {
+        abis[i] = Abi(abis.at(i).architecture(),
+                      abis.at(i).os(),
+                      ProjectExplorer::Abi::AndroidLinuxFlavor,
+                      abis.at(i).binaryFormat(),
+                      abis.at(i).wordWidth());
+    }
+    return abis;
 }
 
 void AndroidQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const

src/plugins/android/androidsettingswidget.cpp

@@ -254,13 +254,13 @@ bool AndroidSettingsWidget::checkNDK(const Utils::FileName &location)
         m_ui->kitWarningIconLabel->setVisible(true);
         m_ui->kitWarningLabel->setVisible(true);
         if (missingQtArchs.count() == 1) {
-            m_ui->kitWarningLabel->setText(tr("Qt version for architecture %1 is missing. To add the Qt version, select Options > Build & Run > Qt Versions.")
+            m_ui->kitWarningLabel->setText(tr("Qt version for architecture %1 is missing.\n To add the Qt version, select Options > Build & Run > Qt Versions.")
                                            .arg(ProjectExplorer::Abi::toString((*missingQtArchs.constBegin()))));
         } else {
             QStringList missingArchs;
             foreach (ProjectExplorer::Abi::Architecture arch, missingQtArchs)
                 missingArchs.append(ProjectExplorer::Abi::toString(arch));
-            m_ui->kitWarningLabel->setText(tr("Qt versions for architectures %1 are missing. To add the Qt versions, select Options > Build & Run > Qt Versions.")
+            m_ui->kitWarningLabel->setText(tr("Qt versions for architectures %1 are missing.\n To add the Qt versions, select Options > Build & Run > Qt Versions.")
                                            .arg(missingArchs.join(QLatin1String(", "))));
         }
     }

src/plugins/android/androidsettingswidget.ui

@@ -126,42 +126,6 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <property name="spacing">
-        <number>2</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="kitWarningIconLabel">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="pixmap">
-          <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="kitWarningLabel">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
      <item row="5" column="0">
       <widget class="QLabel" name="AntLocationLabel">
        <property name="sizePolicy">
@@ -214,6 +178,45 @@
        </property>
       </widget>
      </item>
+     <item row="4" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <property name="spacing">
+        <number>2</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="kitWarningIconLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="pixmap">
+          <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_warning.png</pixmap>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="kitWarningLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
     </layout>
    </item>
    <item>