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

Utils: Remove FileName::isNull

Browse Source 
... and its uses in order to shrink the FileName interface.

Change-Id: I4b9a229d98ad53c4f189e381c89241981ddbed2e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-05-10 11:37:22 +02:00
parent c1488bbc25
commit dd304fc824
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,15 +259,15 @@ bool QbsBuildStep::hasCustomInstallRoot() const
Utils::FileName QbsBuildStep::installRoot(VariableHandling variableHandling) const
{
Utils::FileName root = Utils::FileName::fromString(qbsConfiguration(variableHandling)
.value(Constants::QBS_INSTALL_ROOT_KEY).toString());
if (root.isNull()) {
const QbsBuildConfiguration * const bc
= static_cast<QbsBuildConfiguration *>(buildConfiguration());
root = bc->buildDirectory().appendPath(bc->configurationName())
.appendPath(qbs::InstallOptions::defaultInstallRoot());
}
return root;
const QString root =
qbsConfiguration(variableHandling).value(Constants::QBS_INSTALL_ROOT_KEY).toString();
if (!root.isNull())
return Utils::FileName::fromString(root);
const QbsBuildConfiguration * const bc
= static_cast<QbsBuildConfiguration *>(buildConfiguration());
return bc->buildDirectory().appendPath(bc->configurationName())
.appendPath(qbs::InstallOptions::defaultInstallRoot());
}
int QbsBuildStep::maxJobs() const