From db5bd69b261ed200287b0a06b3c9d979d86380f4 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Tue, 1 Dec 2015 11:29:47 +0100
Subject: [PATCH] Android: Add support for Android 6.0

Change-Id: Icd6a1904d7c1d6fecad3363d9cf72699e01db9f0
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
---
 src/plugins/android/androidmanager.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index e82a14ed85e..54e843954db 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));
     }