summaryrefslogtreecommitdiff
path: root/src/plugins/android
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-05-20 17:28:20 +0200
committerhjk <hjk@qt.io>2019-05-27 09:10:56 +0000
commit7e2992453e88720b5c94507045c91c653b98ff1b (patch)
treecf8548501e75f1cd4c6db05350b3b0a24505b713 /src/plugins/android
parentdc9cbd8f57eca84e955b95fd79e4a64b7453cacc (diff)
downloadqt-creator-7e2992453e88720b5c94507045c91c653b98ff1b.tar.gz
Android: Remove remaining uses of FileName::appendPath()
Change-Id: I33fb650f357d93d177e5977b21b14b42894f571a Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Diffstat (limited to 'src/plugins/android')
-rw-r--r--src/plugins/android/androidmanager.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 113f64de8b..5612a14228 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -643,12 +643,12 @@ bool AndroidManager::updateGradleProperties(ProjectExplorer::Target *target)
const QString sourceDirName = node->data(Constants::AndroidPackageSourceDir).toString();
QFileInfo sourceDirInfo(sourceDirName);
- FileName packageSourceDir = FileName::fromString(sourceDirInfo.canonicalFilePath());
- if (!packageSourceDir.appendPath("gradlew").exists())
+ const FileName packageSourceDir = FileName::fromString(sourceDirInfo.canonicalFilePath())
+ .pathAppended("gradlew");
+ if (!packageSourceDir.exists())
return false;
- Utils::FileName wrapperProps = packageSourceDir;
- wrapperProps.appendPath(QLatin1String("gradle/wrapper/gradle-wrapper.properties"));
+ const FileName wrapperProps = packageSourceDir.pathAppended("gradle/wrapper/gradle-wrapper.properties");
if (wrapperProps.exists()) {
GradleProperties wrapperProperties = readGradleProperties(wrapperProps.toString());
QString distributionUrl = QString::fromLocal8Bit(wrapperProperties["distributionUrl"]);
@@ -661,10 +661,11 @@ bool AndroidManager::updateGradleProperties(ProjectExplorer::Target *target)
GradleProperties localProperties;
localProperties["sdk.dir"] = AndroidConfigurations::currentConfig().sdkLocation().toString().toLocal8Bit();
- if (!mergeGradleProperties(packageSourceDir.appendPath("local.properties").toString(), localProperties))
+ const FileName localPropertiesFile = packageSourceDir.pathAppended("local.properties");
+ if (!mergeGradleProperties(localPropertiesFile.toString(), localProperties))
return false;
- QString gradlePropertiesPath = packageSourceDir.appendPath("gradle.properties").toString();
+ 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();