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/qtsupport/uicgenerator.cpp | |
| parent | 6cec0e203315bd2357893c92eef93375a890eb3c (diff) | |
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/qtsupport/uicgenerator.cpp')
| -rw-r--r-- | src/plugins/qtsupport/uicgenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qtsupport/uicgenerator.cpp b/src/plugins/qtsupport/uicgenerator.cpp index 373c3c7b3d..0fcf70145f 100644 --- a/src/plugins/qtsupport/uicgenerator.cpp +++ b/src/plugins/qtsupport/uicgenerator.cpp @@ -52,7 +52,7 @@ UicGenerator::UicGenerator(const Project *project, const Utils::FilePath &source Utils::FilePath UicGenerator::command() const { - QtSupport::BaseQtVersion *version = nullptr; + QtSupport::QtVersion *version = nullptr; Target *target; if ((target = project()->activeTarget())) version = QtSupport::QtKitAspect::qtVersion(target->kit()); |