Rename QtSupport::BaseQtVersion to QtVersion

... and the Utils::QtVersion enum to Utils::QtMajorVersion to avoid
conflicts.

Change-Id: Ib688c67388272b7204a91444155f60b8c18a56bd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2022-01-21 16:06:36 +01:00
parent 6cec0e2033
commit 25f5771aa4
113 changed files with 636 additions and 636 deletions

View File

@@ -72,12 +72,12 @@ WebAssemblyQtVersionFactory::WebAssemblyQtVersionFactory()
bool WebAssemblyQtVersion::isValid() const
{
return BaseQtVersion::isValid() && qtVersion() >= minimumSupportedQtVersion();
return QtVersion::isValid() && qtVersion() >= minimumSupportedQtVersion();
}
QString WebAssemblyQtVersion::invalidReason() const
{
const QString baseReason = BaseQtVersion::invalidReason();
const QString baseReason = QtVersion::invalidReason();
if (!baseReason.isEmpty())
return baseReason;
@@ -95,14 +95,14 @@ const QtVersionNumber &WebAssemblyQtVersion::minimumSupportedQtVersion()
bool WebAssemblyQtVersion::isQtVersionInstalled()
{
return anyOf(QtVersionManager::versions(), [](const BaseQtVersion *v) {
return anyOf(QtVersionManager::versions(), [](const QtVersion *v) {
return v->type() == Constants::WEBASSEMBLY_QT_VERSION;
});
}
bool WebAssemblyQtVersion::isUnsupportedQtVersionInstalled()
{
return anyOf(QtVersionManager::versions(), [](const BaseQtVersion *v) {
return anyOf(QtVersionManager::versions(), [](const QtVersion *v) {
return v->type() == Constants::WEBASSEMBLY_QT_VERSION
&& v->qtVersion() < WebAssemblyQtVersion::minimumSupportedQtVersion();
});