diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 9dc6666507e..94dbbbb9e3f 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -383,7 +383,7 @@ QString AndroidConfigurations::getDeployDeviceSerialNumber(int *apiLevel, const QVector devices = connectedDevices(); foreach (AndroidDeviceInfo device, devices) { - if (device.sdk >= *apiLevel && device.cpuABI.contains(abi)) { + if (device.sdk >= *apiLevel && device.cpuAbi.contains(abi)) { *apiLevel = device.sdk; return device.serialNumber; } @@ -421,7 +421,7 @@ QVector AndroidConfigurations::connectedDevices() const dev.serialNumber = serialNo; dev.sdk = getSDKVersion(dev.serialNumber); - dev.cpuABI = getAbis(dev.serialNumber); + dev.cpuAbi = getAbis(dev.serialNumber); devices.push_back(dev); } qSort(devices.begin(), devices.end(), androidDevicesLessThan); @@ -509,7 +509,7 @@ QVector AndroidConfigurations::androidVirtualDevices() const if (line.contains(QLatin1String("Target:"))) dev.sdk = line.mid(line.lastIndexOf(QLatin1Char(' '))).remove(QLatin1Char(')')).toInt(); if (line.contains(QLatin1String("ABI:"))) - dev.cpuABI = QStringList() << line.mid(line.lastIndexOf(QLatin1Char(' '))).trimmed(); + dev.cpuAbi = QStringList() << line.mid(line.lastIndexOf(QLatin1Char(' '))).trimmed(); } devices.push_back(dev); } diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 4c1f934b4fe..0fae8c711a4 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -65,7 +65,7 @@ public: struct AndroidDeviceInfo { QString serialNumber; - QStringList cpuABI; + QStringList cpuAbi; int sdk; static QStringList adbSelector(const QString &serialNumber); diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 2cbbbdc6fa1..513001de0a7 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -75,7 +75,7 @@ QVariant AvdModel::data(const QModelIndex &index, int role) const case 1: return QString::fromLatin1("API %1").arg(m_list[index.row()].sdk); case 2: - return m_list[index.row()].cpuABI; + return m_list[index.row()].cpuAbi; } return QVariant(); }