Merge remote-tracking branch 'origin/6.0'

Change-Id: Ia7fc255ee8680e6beac5d4d878f446fe40873183
This commit is contained in:
Eike Ziller
2021-11-08 09:46:57 +01:00
130 changed files with 1693 additions and 173 deletions

View File

@@ -847,7 +847,7 @@ bool AndroidConfig::isValidNdk(const QString &ndkLocation) const
return false;
const QVersionNumber version = ndkVersion(ndkPath);
if (ndkVersion(ndkPath).isNull())
if (version.isNull())
return false;
const FilePath ndkPlatformsDir = ndkPath.pathAppended("platforms");