feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Change-Id: I3ea10aa204b1ea41702edab09884b416cd6d9e06
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2014-05-02 12:53:36 +02:00
parent 0814cc112a
commit dc61b989ac
59 changed files with 94 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/buildconfiguration.cpp
View File

@@ -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