diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-09-30 14:34:31 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-10-01 11:46:43 +0000 |
| commit | b489bfd6155a150c337085ad4ac040973391ac8e (patch) | |
| tree | 94a1c079d01c6aaa087c16316ec45543d4bc53d6 /src/plugins/android/androidmanager.cpp | |
| parent | fc2e22dad247445ed4134afbbaff7d9960fd18e2 (diff) | |
BaseQtVersion: remove qmakeProperty(...) getter
Qt 6 will not use qmake to identify a Qt version, so this can not
be part of the public interface of BaseQtVersion anymore.
Provide getters for the information actually read via qmakeProperty(...).
Use the getters whenever possible.
Change-Id: Iadbee80b75e4f8b06caf90e7ed69fae2029b4dd7
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/android/androidmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index b0f887a74da..4958bd02a3c 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -238,9 +238,8 @@ int AndroidManager::minimumSDK(const ProjectExplorer::Kit *kit) int minSDKVersion = -1; QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(kit); if (version && version->targetDeviceTypes().contains(Constants::ANDROID_DEVICE_TYPE)) { - Utils::FilePath stockManifestFilePath = - Utils::FilePath::fromUserInput(version->qmakeProperty("QT_INSTALL_PREFIX") + - QLatin1String("/src/android/templates/AndroidManifest.xml")); + Utils::FilePath stockManifestFilePath = Utils::FilePath::fromUserInput( + version->prefix().toString() + "/src/android/templates/AndroidManifest.xml"); QDomDocument doc; if (openXmlFile(doc, stockManifestFilePath)) { minSDKVersion = parseMinSdk(doc.documentElement()); @@ -276,7 +275,7 @@ QJsonObject AndroidManager::deploymentSettings(const Target *target) return {}; QJsonObject settings; settings["_description"] = "This file is generated by QtCreator to be read by androiddeployqt and should not be modified by hand."; - settings["qt"] = qt->qmakeProperty("QT_INSTALL_PREFIX"); + settings["qt"] = qt->prefix().toString(); settings["ndk"] = AndroidConfigurations::currentConfig().ndkLocation().toString(); settings["sdk"] = AndroidConfigurations::currentConfig().sdkLocation().toString(); settings["stdcpp-path"] = AndroidConfigurations::currentConfig().toolchainPath().pathAppended("sysroot/usr/lib/").toString(); @@ -728,8 +727,8 @@ bool AndroidManager::updateGradleProperties(ProjectExplorer::Target *target, con const QString gradlePropertiesPath = packageSourceDir.pathAppended("gradle.properties").toString(); GradleProperties gradleProperties = readGradleProperties(gradlePropertiesPath); - gradleProperties["qt5AndroidDir"] = version->qmakeProperty("QT_INSTALL_PREFIX") - .append(QLatin1String("/src/android/java")).toLocal8Bit(); + gradleProperties["qt5AndroidDir"] = (version->prefix().toString() + "/src/android/java") + .toLocal8Bit(); gradleProperties["buildDir"] = ".build"; gradleProperties["androidCompileSdkVersion"] = buildTargetSDK(target).split(QLatin1Char('-')).last().toLocal8Bit(); if (gradleProperties["androidBuildToolsVersion"].isEmpty()) { |