From 25f5771aa44404877f0d5877cf1d16fd37f84b73 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 21 Jan 2022 16:06:36 +0100 Subject: Rename QtSupport::BaseQtVersion to QtVersion ... and the Utils::QtVersion enum to Utils::QtMajorVersion to avoid conflicts. Change-Id: Ib688c67388272b7204a91444155f60b8c18a56bd Reviewed-by: Reviewed-by: Qt CI Bot Reviewed-by: Christian Kandeler --- src/plugins/qmlprojectmanager/qmlproject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/qmlprojectmanager/qmlproject.cpp') diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index 9eccfdabff..e0db9f53c6 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -412,7 +412,7 @@ Tasks QmlProject::projectIssues(const Kit *k) const { Tasks result = Project::projectIssues(k); - const QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k); + const QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(k); if (!version) result.append(createProjectTask(Task::TaskType::Error, tr("No Qt version set in kit."))); @@ -471,7 +471,7 @@ Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *erro auto setKitWithVersion = [&](int qtMajorVersion) { const QList qtVersionkits = Utils::filtered(kits, [qtMajorVersion](const Kit *k) { - QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k); + QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(k); return (version && version->qtVersion().majorVersion == qtMajorVersion); }); if (!qtVersionkits.isEmpty()) { -- cgit v1.2.1