feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Device selection dialog, fix error messages

Browse Source 
Change-Id: Ie9d1535ae93ca0a28bf7f6ccd3ee73bcb783be4c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Daniel Teske
2013-09-17 14:29:02 +02:00
parent 8f7bbb9a08
commit d744919b67
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androiddevicedialog.cpp
View File

@@ -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);