From dc61b989acaa88c892b682ea17985315f3f9206f Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 2 May 2014 12:53:36 +0200 Subject: Project: Use Utils::FileName as return type for projectDirectory(...) Change-Id: I3ea10aa204b1ea41702edab09884b416cd6d9e06 Reviewed-by: Daniel Teske --- src/plugins/projectexplorer/buildconfiguration.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/projectexplorer/buildconfiguration.cpp') diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index 15d4242ba8..f5392a5e92 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -65,7 +65,7 @@ private: bool BuildConfigMacroExpander::resolveMacro(const QString &name, QString *ret) { if (name == QLatin1String("sourceDir")) { - *ret = QDir::toNativeSeparators(m_bc->target()->project()->projectDirectory()); + *ret = m_bc->target()->project()->projectDirectory().toUserOutput(); return true; } if (name == QLatin1String("buildDir")) { @@ -125,7 +125,7 @@ BuildConfiguration::~BuildConfiguration() Utils::FileName BuildConfiguration::buildDirectory() const { QString path = QDir::cleanPath(environment().expandVariables(m_buildDirectory.toString())); - return Utils::FileName::fromString(QDir::cleanPath(QDir(target()->project()->projectDirectory()).absoluteFilePath(path))); + return Utils::FileName::fromString(QDir::cleanPath(QDir(target()->project()->projectDirectory().toString()).absoluteFilePath(path))); } Utils::FileName BuildConfiguration::rawBuildDirectory() const -- cgit v1.2.1