From 419b2951fd571499b0b0101fd1c75e93db706ea7 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Wed, 6 Jan 2016 16:44:32 +0100
Subject: [PATCH] Cmake: Fix problems with QString / Utils::FileName
 conversions

Change-Id: I47acade7b240b622ef7e49155700c1240f7ce70c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index 4252379d955..8ed6b7039ff 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -76,7 +76,7 @@ CMakeRunConfiguration::CMakeRunConfiguration(Target *parent, Core::Id id, const
     addExtraAspect(new TerminalAspect(this, QStringLiteral("CMakeProjectManager.CMakeRunConfiguration.UseTerminal")));
 
     auto wd = new WorkingDirectoryAspect(this, QStringLiteral("CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"));
-    wd->setDefaultWorkingDirectory(workingDirectory);
+    wd->setDefaultWorkingDirectory(Utils::FileName::fromString(workingDirectory));
     addExtraAspect(wd);
 
     ctor();
@@ -110,7 +110,7 @@ QString CMakeRunConfiguration::workingDirectory() const
 {
     const auto *wdAspect = extraAspect<WorkingDirectoryAspect>();
     QTC_ASSERT(wdAspect, return baseWorkingDirectory());
-    return wdAspect->workingDirectory();
+    return wdAspect->workingDirectory().toString();
 }
 
 QString CMakeRunConfiguration::baseWorkingDirectory() const
@@ -138,7 +138,8 @@ void CMakeRunConfiguration::setExecutable(const QString &executable)
 
 void CMakeRunConfiguration::setBaseWorkingDirectory(const QString &wd)
 {
-    extraAspect<WorkingDirectoryAspect>()->setDefaultWorkingDirectory(wd);
+    extraAspect<WorkingDirectoryAspect>()
+        ->setDefaultWorkingDirectory(Utils::FileName::fromString(wd));
 }
 
 QVariantMap CMakeRunConfiguration::toMap() const