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

Android: Add support for Android 6.0

Browse Source 
Change-Id: Icd6a1904d7c1d6fecad3363d9cf72699e01db9f0
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Tobias Hunger
2015-12-01 11:29:47 +01:00
parent bfeb60ace5
commit db5bd69b26
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidmanager.cpp
View File

@@ -280,7 +280,7 @@ QString AndroidManager::loadLocalJarsInitClasses(ProjectExplorer::Target *target
QPair<int, int> AndroidManager::apiLevelRange() QPair<int, int> AndroidManager::apiLevelRange()
{ {
return qMakePair(9, 22); return qMakePair(9, 23);
} }
QString AndroidManager::androidNameForApiLevel(int x) QString AndroidManager::androidNameForApiLevel(int x)
@@ -324,6 +324,8 @@ QString AndroidManager::androidNameForApiLevel(int x)
return QLatin1String("Android 5.0"); return QLatin1String("Android 5.0");
case 22: case 22:
return QLatin1String("Android 5.1"); return QLatin1String("Android 5.1");
case 23:
return QLatin1String("Android 6.0");
default: default:
return tr("Unknown Android version. API Level: %1").arg(QString::number(x)); return tr("Unknown Android version. API Level: %1").arg(QString::number(x));
} }