diff options
author | hjk <hjk@qt.io> | 2022-01-21 16:06:36 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2022-01-24 12:13:19 +0000 |
commit | 25f5771aa44404877f0d5877cf1d16fd37f84b73 (patch) | |
tree | 5496a502f15df7d25724c58ceab82af5f76fb7c4 /src/plugins/android/androidqmlpreviewworker.cpp | |
parent | 6cec0e203315bd2357893c92eef93375a890eb3c (diff) | |
download | qt-creator-25f5771aa44404877f0d5877cf1d16fd37f84b73.tar.gz |
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>
Diffstat (limited to 'src/plugins/android/androidqmlpreviewworker.cpp')
-rw-r--r-- | src/plugins/android/androidqmlpreviewworker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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"; |