feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Even more FileName::appendPath() -> pathAppended()

Browse Source 
Change-Id: I0a8bc391ff3704e14df87e4fa3bc82269146f943
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-05-17 13:20:41 +02:00
parent 339f26aec1
commit eb9e3c807c
9 changed files with 35 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidmanager.cpp
View File

@@ -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)