feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Factor out parsing of platform version into a function

Browse Source 
Will be used in additional places, soon.

Change-Id: I95f62f05f390dffc75fdd599e9a18124985cb185
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alessandro Portale
2023-01-09 13:58:36 +01:00
parent e7321e98b8
commit e2eab57a28
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/android/androidqtversion.cpp
View File

@@ -137,22 +137,23 @@ Utils::FilePath AndroidQtVersion::androidDeploymentSettings(const Target *target
.arg(displayName)); .arg(displayName));
} }
static int versionFromPlatformString(const QString &string, bool *ok = nullptr)
{
static const QRegularExpression regex("android-(\\d+)");
const QRegularExpressionMatch match = regex.match(string);
if (ok)
*ok = false;
return match.hasMatch() ? match.captured(1).toInt(ok) : -1;
}
void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
{ {
m_androidAbis = evaluator->values("ALL_ANDROID_ABIS"); m_androidAbis = evaluator->values("ALL_ANDROID_ABIS");
if (m_androidAbis.isEmpty()) if (m_androidAbis.isEmpty())
m_androidAbis = QStringList{evaluator->value(Constants::ANDROID_TARGET_ARCH)}; m_androidAbis = QStringList{evaluator->value(Constants::ANDROID_TARGET_ARCH)};
const QString androidPlatform = evaluator->value("ANDROID_PLATFORM"); const QString androidPlatform = evaluator->value("ANDROID_PLATFORM");
if (!androidPlatform.isEmpty()) { if (!androidPlatform.isEmpty())
const QRegularExpression regex("android-(\\d+)"); m_minNdk = versionFromPlatformString(androidPlatform);
const QRegularExpressionMatch match = regex.match(androidPlatform);
if (match.hasMatch()) {
bool ok = false;
int tmp = match.captured(1).toInt(&ok);
if (ok)
m_minNdk = tmp;
}
}
QtVersion::parseMkSpec(evaluator); QtVersion::parseMkSpec(evaluator);
} }