diff options
author | hjk <hjk@qt.io> | 2019-05-17 13:20:41 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-05-20 13:13:06 +0000 |
commit | eb9e3c807c6c9e37247da453754558d5571c2506 (patch) | |
tree | 673e5a09cdef063899343008cb2691a46814f08c /src/plugins/android | |
parent | 339f26aec1b0f0388266012eac31151e4e71be2d (diff) |
Even more FileName::appendPath() -> pathAppended()
Change-Id: I0a8bc391ff3704e14df87e4fa3bc82269146f943
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/android')
-rw-r--r-- | src/plugins/android/androidbuildapkstep.cpp | 12 | ||||
-rw-r--r-- | src/plugins/android/androidconfigurations.cpp | 32 | ||||
-rw-r--r-- | src/plugins/android/androiddebugsupport.cpp | 6 | ||||
-rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 2 | ||||
-rw-r--r-- | src/plugins/android/androidmanager.cpp | 10 | ||||
-rw-r--r-- | src/plugins/android/androidpackageinstallationstep.cpp | 2 | ||||
-rw-r--r-- | src/plugins/android/androidrunnerworker.cpp | 2 | ||||
-rw-r--r-- | src/plugins/android/androidsettingswidget.cpp | 12 | ||||
-rw-r--r-- | src/plugins/android/androidtoolchain.cpp | 5 |
9 files changed, 35 insertions, 48 deletions
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index 1af41da340e..04e05fac2a9 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -168,7 +168,7 @@ bool AndroidBuildApkStep::init() const QVersionNumber sdkToolsVersion = AndroidConfigurations::currentConfig().sdkToolsVersion(); if (sdkToolsVersion >= gradleScriptRevokedSdkVersion) { - if (!version->sourcePath().appendPath("src/3rdparty/gradle").exists()) { + if (!version->sourcePath().pathAppended("src/3rdparty/gradle").exists()) { emit addOutput(tr("The installed SDK tools version (%1) does not include Gradle " "scripts. The minimum Qt version required for Gradle build to work " "is %2").arg(sdkToolsVersion.toString()).arg("5.9.0/5.6.3"), @@ -203,7 +203,7 @@ bool AndroidBuildApkStep::init() QFileInfo sourceDirInfo(sourceDirName); parser->setSourceDirectory(Utils::FileName::fromString(sourceDirInfo.canonicalFilePath())); - parser->setBuildDirectory(Utils::FileName::fromString(bc->buildDirectory().appendPath(Constants::ANDROID_BUILDDIRECTORY).toString())); + parser->setBuildDirectory(bc->buildDirectory().pathAppended(Constants::ANDROID_BUILDDIRECTORY)); setOutputParser(parser); m_openPackageLocationForRun = m_openPackageLocation; @@ -220,7 +220,7 @@ bool AndroidBuildApkStep::init() if (Utils::HostOsInfo::isWindowsHost()) command += ".exe"; - QString outputDir = bc->buildDirectory().appendPath(Constants::ANDROID_BUILDDIRECTORY).toString(); + QString outputDir = bc->buildDirectory().pathAppended(Constants::ANDROID_BUILDDIRECTORY).toString(); QString inputFile; if (node) @@ -376,8 +376,8 @@ void AndroidBuildApkStep::doRun() auto setup = [this] { auto bc = target()->activeBuildConfiguration(); Utils::FileName androidLibsDir = bc->buildDirectory() - .appendPath("android-build/libs") - .appendPath(AndroidManager::targetArch(target())); + .pathAppended("android-build/libs") + .pathAppended(AndroidManager::targetArch(target())); if (!androidLibsDir.exists() && !QDir{bc->buildDirectory().toString()}.mkpath(androidLibsDir.toString())) return false; @@ -396,7 +396,7 @@ void AndroidBuildApkStep::doRun() // Copy targets to android build folder for (const auto &target : targets) { - if (!copyFileIfNewer(target, androidLibsDir.appendPath(QFileInfo{target}.fileName()).toString())) + if (!copyFileIfNewer(target, androidLibsDir.pathAppended(QFileInfo{target}.fileName()).toString())) return false; } diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 2c7dc550070..019c35dd423 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -389,9 +389,8 @@ FileName AndroidConfig::clangPath() const QDirIterator iter(path.toString(), hostPatterns, QDir::Dirs); if (iter.hasNext()) { iter.next(); - FileName found = path; - return found.appendPath(iter.fileName()) - .appendPath(HostOsInfo::withExecutableSuffix("bin/clang")); + return path.pathAppended(iter.fileName()) + .pathAppended(HostOsInfo::withExecutableSuffix("bin/clang")); } } @@ -400,16 +399,13 @@ FileName AndroidConfig::clangPath() const FileName AndroidConfig::gdbPath(const ProjectExplorer::Abi &abi) const { - FileName path = m_ndkLocation; - path.appendPath(QString("prebuilt/%1/bin/gdb%2").arg(toolchainHost(), QTC_HOST_EXE_SUFFIX)); + const FileName path = m_ndkLocation.pathAppended( + QString("prebuilt/%1/bin/gdb%2").arg(toolchainHost(), QTC_HOST_EXE_SUFFIX)); if (path.exists()) return path; // fallback for old NDKs (e.g. 10e) - path = m_ndkLocation; - path.appendPath( - QString("toolchains/%1-4.9/prebuilt/%2/bin/%3-gdb%4") + return m_ndkLocation.pathAppended(QString("toolchains/%1-4.9/prebuilt/%2/bin/%3-gdb%4") .arg(toolchainPrefix(abi), toolchainHost(), toolsPrefix(abi), QTC_HOST_EXE_SUFFIX)); - return path; } FileName AndroidConfig::makePath() const @@ -703,8 +699,8 @@ QVersionNumber AndroidConfig::sdkToolsVersion() const { QVersionNumber version; if (m_sdkLocation.exists()) { - Utils::FileName sdkToolsPropertiesPath(m_sdkLocation); - sdkToolsPropertiesPath.appendPath("tools/source.properties"); + const Utils::FileName sdkToolsPropertiesPath + = m_sdkLocation.pathAppended("tools/source.properties"); QSettings settings(sdkToolsPropertiesPath.toString(), QSettings::IniFormat); auto versionStr = settings.value(sdkToolsVersionKey).toString(); version = QVersionNumber::fromString(versionStr); @@ -715,9 +711,7 @@ QVersionNumber AndroidConfig::sdkToolsVersion() const QVersionNumber AndroidConfig::buildToolsVersion() const { QVersionNumber maxVersion; - Utils::FileName buildtoolsDir = m_sdkLocation; - buildtoolsDir.appendPath("build-tools"); - QDir buildToolsDir(buildtoolsDir.toString()); + QDir buildToolsDir(m_sdkLocation.pathAppended("build-tools").toString()); for (const QFileInfo &file: buildToolsDir.entryList(QDir::Dirs|QDir::NoDotAndDotDot)) maxVersion = qMax(maxVersion, QVersionNumber::fromString(file.fileName())); return maxVersion; @@ -752,8 +746,8 @@ static inline QString gdbServerArch(const Abi &abi) FileName AndroidConfig::gdbServer(const ProjectExplorer::Abi &abi) const { - FileName path = AndroidConfigurations::currentConfig().ndkLocation(); - path.appendPath(QString::fromLatin1("prebuilt/android-%1/gdbserver/gdbserver") + const FileName path = AndroidConfigurations::currentConfig().ndkLocation() + .pathAppended(QString("prebuilt/android-%1/gdbserver/gdbserver") .arg(gdbServerArch(abi))); if (path.exists()) return path; @@ -769,8 +763,7 @@ QVersionNumber AndroidConfig::ndkVersion() const return version; } - Utils::FileName ndkPropertiesPath(m_ndkLocation); - ndkPropertiesPath.appendPath("source.properties"); + const FileName ndkPropertiesPath = m_ndkLocation.pathAppended("source.properties"); if (ndkPropertiesPath.exists()) { // source.properties files exists in NDK version > 11 QSettings settings(ndkPropertiesPath.toString(), QSettings::IniFormat); @@ -778,8 +771,7 @@ QVersionNumber AndroidConfig::ndkVersion() const version = QVersionNumber::fromString(versionStr); } else { // No source.properties. There should be a file named RELEASE.TXT - Utils::FileName ndkReleaseTxtPath(m_ndkLocation); - ndkReleaseTxtPath.appendPath("RELEASE.TXT"); + const FileName ndkReleaseTxtPath = m_ndkLocation.pathAppended("RELEASE.TXT"); Utils::FileReader reader; QString errorString; if (reader.fetch(ndkReleaseTxtPath.toString(), &errorString)) { diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 7c61a37f06b..4cd3a09942b 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -191,9 +191,9 @@ void AndroidDebugSupport::start() int sdkVersion = qMax(AndroidManager::minimumSDK(kit), minimumNdk); Utils::FileName sysRoot = AndroidConfigurations::currentConfig().ndkLocation() - .appendPath("platforms") - .appendPath(QString("android-%1").arg(sdkVersion)) - .appendPath(toNdkArch(AndroidManager::targetArch(target))); + .pathAppended("platforms") + .pathAppended(QString("android-%1").arg(sdkVersion)) + .pathAppended(toNdkArch(AndroidManager::targetArch(target))); setSysRoot(sysRoot); qCDebug(androidDebugSupportLog) << "Sysroot: " << sysRoot; } diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 6bb49e00dd7..e75606253c3 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -254,7 +254,7 @@ bool AndroidDeployQtStep::init() m_command += QLatin1Char('/'); m_command += Utils::HostOsInfo::withExecutableSuffix(QLatin1String("androiddeployqt")); - m_workingDirectory = bc->buildDirectory().appendPath(QLatin1String(Constants::ANDROID_BUILDDIRECTORY)).toString(); + m_workingDirectory = bc->buildDirectory().pathAppended(Constants::ANDROID_BUILDDIRECTORY).toString(); Utils::QtcProcess::addArg(&m_androiddeployqtArgs, QLatin1String("--verbose")); Utils::QtcProcess::addArg(&m_androiddeployqtArgs, QLatin1String("--output")); diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index d6694e4cb07..77e24846ba4 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -286,7 +286,7 @@ QJsonObject AndroidManager::deploymentSettings(const Target *target) settings["useLLVM"] = true; settings["ndk-host"] = AndroidConfigurations::currentConfig().toolchainHost(); settings["stdcpp-path"] = AndroidConfigurations::currentConfig().ndkLocation() - .appendPath("/sources/cxx-stl/llvm-libc++/libs/" + .pathAppended("/sources/cxx-stl/llvm-libc++/libs/" + targetArch(target) + "/libc++_shared.so").toString(); return settings; @@ -295,7 +295,7 @@ QJsonObject AndroidManager::deploymentSettings(const Target *target) Utils::FileName AndroidManager::dirPath(const ProjectExplorer::Target *target) { if (target->activeBuildConfiguration()) - return target->activeBuildConfiguration()->buildDirectory().appendPath(QLatin1String(Constants::ANDROID_BUILDDIRECTORY)); + return target->activeBuildConfiguration()->buildDirectory().pathAppended(Constants::ANDROID_BUILDDIRECTORY); return Utils::FileName(); } @@ -313,7 +313,7 @@ Utils::FileName AndroidManager::apkPath(const ProjectExplorer::Target *target) else apkPath += QLatin1String("debug.apk"); - return dirPath(target).appendPath(apkPath); + return dirPath(target).pathAppended(apkPath); } Utils::FileName AndroidManager::manifestSourcePath(ProjectExplorer::Target *target) @@ -335,7 +335,7 @@ Utils::FileName AndroidManager::manifestPath(ProjectExplorer::Target *target) QVariant manifest = target->namedSettings(AndroidManifestName); if (manifest.isValid()) return manifest.value<FileName>(); - return dirPath(target).appendPath(AndroidManifestName); + return dirPath(target).pathAppended(AndroidManifestName); } void AndroidManager::setManifestPath(Target *target, const FileName &path) @@ -345,7 +345,7 @@ void AndroidManager::setManifestPath(Target *target, const FileName &path) Utils::FileName AndroidManager::defaultPropertiesPath(ProjectExplorer::Target *target) { - return dirPath(target).appendPath(AndroidDefaultPropertiesName); + return dirPath(target).pathAppended(AndroidDefaultPropertiesName); } QString AndroidManager::deviceSerialNumber(ProjectExplorer::Target *target) diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp index 325c750fd40..3aafb45cc91 100644 --- a/src/plugins/android/androidpackageinstallationstep.cpp +++ b/src/plugins/android/androidpackageinstallationstep.cpp @@ -61,7 +61,7 @@ AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bs bool AndroidPackageInstallationStep::init() { BuildConfiguration *bc = buildConfiguration(); - QString dirPath = bc->buildDirectory().appendPath(Constants::ANDROID_BUILDDIRECTORY).toString(); + QString dirPath = bc->buildDirectory().pathAppended(Constants::ANDROID_BUILDDIRECTORY).toString(); if (HostOsInfo::isWindowsHost()) if (bc->environment().searchInPath("sh.exe").isEmpty()) dirPath = QDir::toNativeSeparators(dirPath); diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index c1fdb72c33b..54bca1e55ed 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -589,7 +589,7 @@ void AndroidRunnerWorker::handleJdbWaiting() } m_afterFinishAdbCommands.push_back(removeForward.join(' ')); - auto jdbPath = AndroidConfigurations::currentConfig().openJDKLocation().appendPath("bin"); + auto jdbPath = AndroidConfigurations::currentConfig().openJDKLocation().pathAppended("bin"); if (Utils::HostOsInfo::isWindowsHost()) jdbPath.appendPath("jdb.exe"); else diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index b45da47d417..9b7f1f1c3b5 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -377,8 +377,7 @@ void AndroidSettingsWidget::validateJdk() auto summaryWidget = static_cast<SummaryWidget *>(m_ui->javaDetailsWidget->widget()); summaryWidget->setPointValid(JavaPathExistsRow, jdkPathExists); - Utils::FileName bin = m_androidConfig.openJDKLocation(); - bin.appendPath(QLatin1String("bin/javac" QTC_HOST_EXE_SUFFIX)); + const Utils::FileName bin = m_androidConfig.openJDKLocation().pathAppended("bin/javac" QTC_HOST_EXE_SUFFIX); summaryWidget->setPointValid(JavaJdkValidRow, jdkPathExists && bin.exists()); updateUI(); } @@ -391,12 +390,9 @@ void AndroidSettingsWidget::validateNdk() auto summaryWidget = static_cast<SummaryWidget *>(m_ui->androidDetailsWidget->widget()); summaryWidget->setPointValid(NdkPathExistsRow, m_androidConfig.ndkLocation().exists()); - Utils::FileName ndkPlatformsDir(ndkPath); - ndkPlatformsDir.appendPath("platforms"); - Utils::FileName ndkToolChainsDir(ndkPath); - ndkToolChainsDir.appendPath("toolchains"); - Utils::FileName ndkSourcesDir(ndkPath); - ndkSourcesDir.appendPath("sources/cxx-stl"); + const Utils::FileName ndkPlatformsDir = ndkPath.pathAppended("platforms"); + const Utils::FileName ndkToolChainsDir = ndkPath.pathAppended("toolchains"); + const Utils::FileName ndkSourcesDir = ndkPath.pathAppended("sources/cxx-stl"); summaryWidget->setPointValid(NdkDirStructureRow, ndkPlatformsDir.exists() && ndkToolChainsDir.exists() diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index 4b6f85f5c55..752b935ef0e 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -95,8 +95,7 @@ void AndroidToolChain::addToEnvironment(Environment &env) const const Utils::FileName javaHome = AndroidConfigurations::currentConfig().openJDKLocation(); if (!javaHome.isEmpty() && javaHome.toFileInfo().exists()) { env.set(QLatin1String("JAVA_HOME"), javaHome.toString()); - Utils::FileName javaBin = javaHome; - javaBin.appendPath(QLatin1String("bin")); + const FileName javaBin = javaHome.pathAppended("bin"); if (!Utils::contains(env.path(), [&javaBin](const Utils::FileName &p) { return p == javaBin; })) env.prependOrSetPath(javaBin.toUserOutput()); } @@ -166,7 +165,7 @@ ToolChainList AndroidToolChainFactory::autoDetect(CToolChainList &alreadyKnown) static FileName clangPlusPlusPath(const FileName &clangPath) { - return clangPath.parentDir().appendPath( + return clangPath.parentDir().pathAppended( HostOsInfo::withExecutableSuffix( QFileInfo(clangPath.toString()).baseName() + "++")); } |