diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-02 18:42:05 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-02 18:42:05 +0100 |
| commit | 100ea30a1a5ccb0af4adafbf08b8fa89fe3c0ee7 (patch) | |
| tree | 0b2aca7b1533ac466e7d2312a6bd3fa1a0282ea1 /src/plugins/android/androidmanager.cpp | |
| parent | f86ebcbf22d7df6be60f1fc5c9f0f30a76e104d6 (diff) | |
| parent | e4be9edc4d538465338b8981294aa414a43b7255 (diff) | |
| download | qt-creator-100ea30a1a5ccb0af4adafbf08b8fa89fe3c0ee7.tar.gz | |
Merge remote-tracking branch 'origin/3.6'
Conflicts:
src/plugins/projectexplorer/toolchainmanager.cpp
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
Change-Id: Id736c6922670c921c689219cb817b1541eaaf304
Diffstat (limited to 'src/plugins/android/androidmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 1882f6e91c..4a2c49bdca 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -280,7 +280,7 @@ QString AndroidManager::loadLocalJarsInitClasses(ProjectExplorer::Target *target QPair<int, int> AndroidManager::apiLevelRange() { - return qMakePair(9, 22); + return qMakePair(9, 23); } QString AndroidManager::androidNameForApiLevel(int x) @@ -324,6 +324,8 @@ QString AndroidManager::androidNameForApiLevel(int x) return QLatin1String("Android 5.0"); case 22: return QLatin1String("Android 5.1"); + case 23: + return QLatin1String("Android 6.0"); default: return tr("Unknown Android version. API Level: %1").arg(QString::number(x)); } |