diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2014-05-02 12:53:36 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-05-06 11:48:10 +0200 |
| commit | dc61b989acaa88c892b682ea17985315f3f9206f (patch) | |
| tree | 32bf7437b1beb9eed01e74db029113c9c9088e44 /src/plugins/projectexplorer/buildconfiguration.cpp | |
| parent | 0814cc112abac5c18e873dcfa388f54ecac7b8a8 (diff) | |
| download | qt-creator-dc61b989acaa88c892b682ea17985315f3f9206f.tar.gz | |
Project: Use Utils::FileName as return type for projectDirectory(...)
Change-Id: I3ea10aa204b1ea41702edab09884b416cd6d9e06
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/projectexplorer/buildconfiguration.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/buildconfiguration.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |