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

More FileName::appendPath() -> .pathAppended()

Browse Source 
Change-Id: I403d34e4f52f758339c158efc7a11fd329e3e043
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-05-17 12:32:05 +02:00
parent 0565457b5c
commit f4c9e5e5c4
23 changed files with 39 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -266,8 +266,8 @@ Utils::FileName QbsBuildStep::installRoot(VariableHandling variableHandling) con
const QbsBuildConfiguration * const bc
= static_cast<QbsBuildConfiguration *>(buildConfiguration());
return bc->buildDirectory().appendPath(bc->configurationName())
.appendPath(qbs::InstallOptions::defaultInstallRoot());
return bc->buildDirectory().pathAppended(bc->configurationName())
.pathAppended(qbs::InstallOptions::defaultInstallRoot());
}
int QbsBuildStep::maxJobs() const

3
src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
View File

@@ -203,8 +203,7 @@ Kit *QbsProjectImporter::createKit(void *directoryData) const
qCDebug(qbsPmLog) << "creating kit for imported build" << bgData->bgFilePath.toUserOutput();
QtVersionData qtVersionData;
if (!bgData->qtBinPath.isEmpty()) {
FileName qmakeFilePath = bgData->qtBinPath;
qmakeFilePath.appendPath(HostOsInfo::withExecutableSuffix("qmake"));
const FileName qmakeFilePath = bgData->qtBinPath.pathAppended(HostOsInfo::withExecutableSuffix("qmake"));
qtVersionData = findOrCreateQtVersion(qmakeFilePath);
}
return createTemporaryKit(qtVersionData,[this, bgData](Kit *k) -> void {