summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2013-09-17 14:29:02 +0200
committerDaniel Teske <daniel.teske@digia.com>2013-09-17 18:25:41 +0200
commitd744919b67076824e236b27ccca86c21300902da (patch)
tree085c6eca38b1f77180682974d27881fc78b687a1 /src
parent8f7bbb9a0821e8e51085fd5a85f843f09d217abe (diff)
downloadqt-creator-d744919b67076824e236b27ccca86c21300902da.tar.gz
Android: Device selection dialog, fix error messages
Change-Id: Ie9d1535ae93ca0a28bf7f6ccd3ee73bcb783be4c Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/android/androiddevicedialog.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/android/androiddevicedialog.cpp b/src/plugins/android/androiddevicedialog.cpp
index eefd39f4c9..683eed4d7e 100644
--- a/src/plugins/android/androiddevicedialog.cpp
+++ b/src/plugins/android/androiddevicedialog.cpp
@@ -339,12 +339,10 @@ void AndroidDeviceModel::setDevices(const QVector<AndroidDeviceInfo> &devices)
if (device.unauthorized) {
error = tr("Unauthorized. Please check the confirmation dialog on your device..").arg(device.serialNumber);
} else if (!device.cpuAbi.contains(m_abi)) {
- error = tr("ABI is incompatible, device supports ABIs: %2.")
- .arg(AndroidConfigurations::instance().getProductModel(device.serialNumber))
+ error = tr("ABI is incompatible, device supports ABIs: %1.")
.arg(device.cpuAbi.join(QLatin1String(" ")));
} else if (device.sdk < m_apiLevel) {
- error = tr("API Level of device is: %2.")
- .arg(AndroidConfigurations::instance().getProductModel(device.serialNumber))
+ error = tr("API Level of device is: %1.")
.arg(device.sdk);
} else {
new AndroidDeviceModelNode(compatibleDevices, device);