Project: Use Utils::FileName as return type for projectDirectory(...)

Change-Id: I3ea10aa204b1ea41702edab09884b416cd6d9e06
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
index 00dcc07549..dcf5b7edda 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
@@ -68,7 +68,7 @@ static Utils::FileName defaultBuildDirectory(bool supportsShadowBuild,
 {
     if (supportsShadowBuild)
         return Utils::FileName::fromString(QmakeProject::shadowBuildDirectory(projectPath, k, suffix));
-    return Utils::FileName::fromString(ProjectExplorer::Project::projectDirectory(projectPath));
+    return ProjectExplorer::Project::projectDirectory(Utils::FileName::fromString(projectPath));
 }
 
 using namespace Internal;
@@ -186,7 +186,7 @@ void QmakeBuildConfiguration::updateShadowBuild()
     bool currentShadowBuild = supportsShadowBuilds();
     if (currentShadowBuild != m_qtVersionSupportsShadowBuilds) {
         if (!currentShadowBuild)
-            setBuildDirectory(Utils::FileName::fromString(target()->project()->projectDirectory()));
+            setBuildDirectory(target()->project()->projectDirectory());
         m_qtVersionSupportsShadowBuilds = currentShadowBuild;
     }
 }
@@ -244,7 +244,7 @@ void QmakeBuildConfiguration::setFileNodeBuild(FileNode *node)
 /// still is a in-source build
 bool QmakeBuildConfiguration::isShadowBuild() const
 {
-    return buildDirectory().toString() != target()->project()->projectDirectory();
+    return buildDirectory() != target()->project()->projectDirectory();
 }
 
 void QmakeBuildConfiguration::setBuildDirectory(const FileName &directory)
@@ -254,7 +254,7 @@ void QmakeBuildConfiguration::setBuildDirectory(const FileName &directory)
     BuildConfiguration::setBuildDirectory(directory);
     QTC_CHECK(supportsShadowBuilds()
               || (!supportsShadowBuilds()
-                  && buildDirectory().toString() == target()->project()->projectDirectory()));
+                  && buildDirectory() == target()->project()->projectDirectory()));
     emitProFileEvaluateNeeded();
 }