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/androidmanager.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/androidmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 74695c219b..049de020b0 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -160,7 +160,7 @@ int AndroidManager::minimumSDK(const Target *target) int AndroidManager::minimumSDK(const Kit *kit) { int minSdkVersion = -1; - QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(kit); + QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(kit); if (version && version->targetDeviceTypes().contains(Constants::ANDROID_DEVICE_TYPE)) { FilePath stockManifestFilePath = FilePath::fromUserInput( version->prefix().toString() + "/src/android/templates/AndroidManifest.xml"); @@ -206,7 +206,7 @@ QString AndroidManager::archTriplet(const QString &abi) QJsonObject AndroidManager::deploymentSettings(const Target *target) { - QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(target->kit()); + QtSupport::QtVersion *qt = QtSupport::QtKitAspect::qtVersion(target->kit()); if (!qt) return {}; @@ -253,7 +253,7 @@ FilePath AndroidManager::androidBuildDirectory(const Target *target) bool AndroidManager::isQt5CmakeProject(const ProjectExplorer::Target *target) { - const QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(target->kit()); + const QtSupport::QtVersion *qt = QtSupport::QtKitAspect::qtVersion(target->kit()); const bool isQt5 = qt && qt->qtVersion() < QtSupport::QtVersionNumber{6, 0, 0}; const Core::Context cmakeCtx = Core::Context(CMakeProjectManager::Constants::CMAKE_PROJECT_ID); const bool isCmakeProject = (target->project()->projectContext() == cmakeCtx); @@ -446,7 +446,7 @@ void AndroidManager::setDeviceApiLevel(Target *target, int level) target->setNamedSettings(ApiLevelKey, level); } -int AndroidManager::defaultMinimumSDK(const QtSupport::BaseQtVersion *qtVersion) +int AndroidManager::defaultMinimumSDK(const QtSupport::QtVersion *qtVersion) { if (qtVersion && qtVersion->qtVersion() >= QtSupport::QtVersionNumber{6, 0}) return 23; @@ -692,7 +692,7 @@ static bool mergeGradleProperties(const QString &path, GradleProperties properti bool AndroidManager::updateGradleProperties(Target *target, const QString &buildKey) { - QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit()); + QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit()); if (!version) return false; |