summaryrefslogtreecommitdiff
path: root/src/plugins/android/androidconfigurations.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2022-02-02 16:32:24 +0100
committerAlessandro Portale <alessandro.portale@qt.io>2022-02-03 15:31:13 +0000
commit9bc9fb5a0d9a235b06356fc03d50dab0719d905a (patch)
tree89e5df7be5730cf4b8bed99885355d52ccdc258a /src/plugins/android/androidconfigurations.cpp
parent1e34d6ee2218a74c1f7be8f903bcd0a0101755b7 (diff)
downloadqt-creator-9bc9fb5a0d9a235b06356fc03d50dab0719d905a.tar.gz
Fix avdmanageroutputparser test
- There is no PLUGIN_DEPENDS for tests, and it wouldn't work anyhow because of duplicated symbols. It was interpreted as a dependency and the test disabled because no such target exists. - Move the platformNameToApiLevel(...) function to avdmanageroutputparser.h to break the dependency to a lot of Android support code. Amends 78da7e2922274c429bb677abf63157b8ae679d03 Change-Id: I6933684a76e5291d415c72388caa3df2bee7cbfb Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/android/androidconfigurations.cpp')
-rw-r--r--src/plugins/android/androidconfigurations.cpp22
1 files changed, 0 insertions, 22 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 34383bad3a..9de48da0ee 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -473,28 +473,6 @@ QString AndroidConfig::apiLevelNameFor(const SdkPlatform *platform)
QString("android-%1").arg(platform->apiLevel()) : "";
}
-int AndroidConfig::platformNameToApiLevel(const QString &platformName)
-{
- int apiLevel = -1;
- static const QRegularExpression re("(android-)(?<apiLevel>[0-9A-Z]{1,})",
- QRegularExpression::CaseInsensitiveOption);
- QRegularExpressionMatch match = re.match(platformName);
- if (match.hasMatch()) {
- QString apiLevelStr = match.captured("apiLevel");
- bool isUInt;
- apiLevel = apiLevelStr.toUInt(&isUInt);
- if (!isUInt) {
- if (apiLevelStr == 'Q')
- apiLevel = 29;
- else if (apiLevelStr == 'R')
- apiLevel = 30;
- else if (apiLevelStr == 'S')
- apiLevel = 31;
- }
- }
- return apiLevel;
-}
-
bool AndroidConfig::isCmdlineSdkToolsInstalled() const
{
QString toolPath("cmdline-tools/latest/bin/sdkmanager");