From 4b73de5580971533807306d5067c3f37be410f51 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 4 Apr 2023 12:43:40 +0100 Subject: [PATCH] Android: allow non-integer platform sdk versions Some of the more recent SDK platform versions don't follow the form android-xx (x being integer) and can contain non-integer characters or other sections such as android-33-ext4, which were not showing on the list of SDK platform versions in the project's settings. Task-number: QTBUG-112465 Change-Id: I3de14c4f1b15a64dcced48c6e8817efbda6677bc Reviewed-by: Reviewed-by: Alessandro Portale --- src/plugins/android/androidconfigurations.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index cf1b005bde5..3c3b64062ec 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -432,8 +432,12 @@ QStringList AndroidConfig::apiLevelNamesFor(const SdkPlatformList &platforms) QString AndroidConfig::apiLevelNameFor(const SdkPlatform *platform) { - return platform && platform->apiLevel() > 0 ? - QString("android-%1").arg(platform->apiLevel()) : ""; + if (platform && platform->apiLevel() > 0) { + QString sdkStylePath = platform->sdkStylePath(); + return sdkStylePath.remove("platforms;"); + } + + return {}; } FilePath AndroidConfig::adbToolPath() const