Merge remote-tracking branch 'origin/9.0'

Change-Id: I58ff80e0be838ef5f149c091b8f74cda415ed53f
This commit is contained in:
Eike Ziller
2023-01-02 11:19:06 +01:00
4 changed files with 7 additions and 4 deletions

View File

@@ -897,7 +897,7 @@ QVariant AndroidBuildApkStep::data(Utils::Id id) const
if (id == Constants::AndroidNdkPlatform) {
if (auto qtVersion = QtKitAspect::qtVersion(kit()))
return AndroidConfigurations::currentConfig()
.bestNdkPlatformMatch(AndroidManager::minimumSDK(target()), qtVersion).mid(8);
.bestNdkPlatformMatch(AndroidManager::minimumSDK(target()), qtVersion);
return {};
}
if (id == Constants::NdkLocation) {