From 25f5771aa44404877f0d5877cf1d16fd37f84b73 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
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: <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>
---
 src/plugins/android/androidqmlpreviewworker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/plugins/android/androidqmlpreviewworker.cpp')

diff --git a/src/plugins/android/androidqmlpreviewworker.cpp b/src/plugins/android/androidqmlpreviewworker.cpp
index 60372f33dc..cb80945401 100644
--- a/src/plugins/android/androidqmlpreviewworker.cpp
+++ b/src/plugins/android/androidqmlpreviewworker.cpp
@@ -339,7 +339,7 @@ bool AndroidQmlPreviewWorker::preparePreviewArtefacts()
 FilePath AndroidQmlPreviewWorker::createQmlrcFile(const FilePath &workFolder,
                                                   const QString &basename)
 {
-    const QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(m_rc->kit());
+    const QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(m_rc->kit());
     const FilePath rccBinary = qtVersion->rccFilePath();
     QtcProcess rccProcess;
     FilePath qrcPath = FilePath::fromString(basename) + ".qrc4viewer";
-- 
cgit v1.2.1