From 88edfdb1b2f46ffe0f342c2c3176fc5c125eb0b1 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Wed, 8 Jan 2020 10:42:57 +0200
Subject: [PATCH] Android: fix avdManager sdk parsing of android-Q to
 android-29

Some of latest system-images have SDK version as android-Q instead of
android-29, this will return an error because currect implementation
looks only for integers.

Task-number: QTCREATORBUG-23284
Change-Id: Ied6663110169edb2a5488b2724d1fa4e46131da6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androidsdkmanager.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index 399ab1c685d..b77bdd679ae 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -69,12 +69,15 @@ using SdkCmdFutureInterface = QFutureInterface<AndroidSdkManager::OperationOutpu
 int platformNameToApiLevel(const QString &platformName)
 {
     int apiLevel = -1;
-    QRegularExpression re("(android-)(?<apiLevel>[0-9]{1,})",
+    QRegularExpression re("(android-)(?<apiLevel>[0-9Q]{1,})",
                           QRegularExpression::CaseInsensitiveOption);
     QRegularExpressionMatch match = re.match(platformName);
     if (match.hasMatch()) {
         QString apiLevelStr = match.captured("apiLevel");
-        apiLevel = apiLevelStr.toInt();
+        if (apiLevelStr == 'Q')
+            apiLevel = 29;
+        else
+            apiLevel = apiLevelStr.toInt();
     }
     return apiLevel;
 }