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

Replace QtSupport::QtVersionNumber with QVersionNumber

Browse Source 
Task-number: QTCREATORBUG-27786
Change-Id: I71a44709c264829f629c9dfce702076eda297a77
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2022-07-04 18:36:40 +02:00
parent 1e8089d5b7
commit a917770053
32 changed files with 107 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/android/androidconfigurations.cpp
View File

@@ -318,14 +318,14 @@ void AndroidConfig::parseDependenciesJson()
}
auto fillQtVersionsRange = [](const QString &shortVersion) {
QList<QtVersionNumber> versions;
QList<QVersionNumber> versions;
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)));
versions.append(QVersionNumber::fromString(match.captured(1) + QString::number(i)));
else
versions.append(QtVersionNumber(shortVersion + ".-1"));
versions.append(QVersionNumber::fromString(shortVersion + ".-1"));
return versions;
};
@@ -1010,7 +1010,7 @@ bool AndroidConfig::sdkToolsOk() const
QStringList AndroidConfig::essentialsFromQtVersion(const QtVersion &version) const
{
QtVersionNumber qtVersion = version.qtVersion();
QVersionNumber qtVersion = version.qtVersion();
for (const SdkForQtVersions &item : m_specificQtVersions)
if (item.containsVersion(qtVersion))
return item.essentialPackages;
@@ -1020,9 +1020,8 @@ QStringList AndroidConfig::essentialsFromQtVersion(const QtVersion &version) con
QString AndroidConfig::ndkPathFromQtVersion(const QtVersion &version) const
{
QtVersionNumber qtVersion(version.qtVersionString());
for (const SdkForQtVersions &item : m_specificQtVersions)
if (item.containsVersion(qtVersion))
if (item.containsVersion(version.qtVersion()))
return item.ndkPath;
return m_defaultSdkDepends.ndkPath;
@@ -1033,10 +1032,11 @@ QStringList AndroidConfig::defaultEssentials() const
return m_defaultSdkDepends.essentialPackages + m_commonEssentialPkgs;
}
bool SdkForQtVersions::containsVersion(const QtVersionNumber &qtVersion) const
bool SdkForQtVersions::containsVersion(const QVersionNumber &qtVersion) const
{
return versions.contains(qtVersion)
|| versions.contains(QtVersionNumber(qtVersion.majorVersion, qtVersion.minorVersion));
|| versions.contains(QVersionNumber(qtVersion.majorVersion(),
qtVersion.minorVersion()));
}
FilePath AndroidConfig::openJDKLocation() const