Utils: Remove FileName::isNull

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

Change-Id: I4b9a229d98ad53c4f189e381c89241981ddbed2e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 1cd0b4f85fe..7da92d837d4 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -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