diff --git a/share/qtcreator/android/sdk_definitions.json b/share/qtcreator/android/sdk_definitions.json index 9dd6ee4caed..1c7476763be 100644 --- a/share/qtcreator/android/sdk_definitions.json +++ b/share/qtcreator/android/sdk_definitions.json @@ -22,7 +22,7 @@ "ndk_path": "ndk/23.1.7779620" }, { - "versions": ["6.3", "6.2", "5.15"], + "versions": ["6.3", "6.2", "5.15.[9-20]"], "sdk_essential_packages": ["build-tools;31.0.0", "ndk;22.1.7171670"], "ndk_path": "ndk/22.1.7171670" }, diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index c4942aee3ff..642cef0b085 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -344,13 +344,13 @@ void AndroidConfig::parseDependenciesJson() auto fillQtVersionsRange = [](const QString &shortVersion) { QList versions; - QRegularExpression re("([0-9]\\.[0-9]*\\.)\\[([0-9])\\-([0-9])\\]"); + const QRegularExpression re(R"(([0-9]\.[0-9]+\.)\[([0-9]+)\-([0-9]+)\])"); QRegularExpressionMatch match = re.match(shortVersion); if (match.hasMatch() && match.lastCapturedIndex() == 3) for (int i = match.captured(2).toInt(); i <= match.captured(3).toInt(); ++i) versions.append(QtVersionNumber(match.captured(1) + QString::number(i))); else - versions.append(QtVersionNumber(shortVersion)); + versions.append(QtVersionNumber(shortVersion + ".-1")); return versions; };