diff options
| author | hjk <hjk@qt.io> | 2019-05-17 12:32:05 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-05-17 11:55:04 +0000 |
| commit | f4c9e5e5c4b7f61d28e34c1912965c0e27d3b0e6 (patch) | |
| tree | 18f296e0ca70bb0a6ac9428b9dceee43ca8d0131 /src/plugins/qbsprojectmanager | |
| parent | 0565457b5c16564d2b230dca8eea6d94024efae2 (diff) | |
More FileName::appendPath() -> .pathAppended()
Change-Id: I403d34e4f52f758339c158efc7a11fd329e3e043
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/qbsprojectmanager')
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsprojectimporter.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 7da92d837d4..a039be62cb1 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -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 diff --git a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp index 063e14d363e..6d40a0acc19 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp @@ -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 { |