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

Android: Fix crash if avds cpu's could not be determined

Browse Source 
That can happen on strange setups with multiple avds

Task-number: QTCREATORBUG-10362
Change-Id: Ib6fef4ee3538632c2c71264d6a6c43e3bd917c69
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Daniel Teske
2013-10-15 13:44:11 +02:00
parent 75ed8fc990
commit 6bd08800d7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,8 +74,10 @@ QVariant AvdModel::data(const QModelIndex &index, int role) const
return m_list[index.row()].serialNumber; return m_list[index.row()].serialNumber;
case 1: case 1:
return QString::fromLatin1("API %1").arg(m_list[index.row()].sdk); return QString::fromLatin1("API %1").arg(m_list[index.row()].sdk);
case 2: case 2: {
return m_list[index.row()].cpuAbi.first(); QStringList cpuAbis = m_list[index.row()].cpuAbi;
return cpuAbis.isEmpty() ? QVariant() : QVariant(cpuAbis.first());
}
} }
return QVariant(); return QVariant();
} }