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

QbsProjectManager: Fix default build directory

Browse Source 
Commit a43331ba67 broke the build, and commit 4a3546f58a fixed it, but
used the wrong function.

Fixes: QTCREATORBUG-22142
Change-Id: I8a66bc8a4501f017726149544d73a728ab753e32
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Kandeler
2019-03-15 13:11:57 +01:00
parent fdfb4f5fa3
commit 312c4a1433
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
View File

@@ -71,7 +71,7 @@ static FileName defaultBuildDirectory(const QString &projectFilePath, const Kit
const QString projectName = QFileInfo(projectFilePath).completeBaseName();
ProjectMacroExpander expander(projectFilePath, projectName, k, bcName, buildType);
QString projectDir = Project::projectDirectory(FileName::fromString(projectFilePath)).toString();
QString buildPath = expander.expand(ProjectExplorerPlugin::defaultBuildDirectoryTemplate());
QString buildPath = expander.expand(ProjectExplorerPlugin::buildDirectoryTemplate());
return FileName::fromString(FileUtils::resolvePath(projectDir, buildPath));
}

2
src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
View File

@@ -94,7 +94,7 @@ static QString buildDir(const QString &projectFilePath, const Kit *k)
BuildConfiguration::Unknown);
const QString projectDir
= Project::projectDirectory(FileName::fromString(projectFilePath)).toString();
const QString buildPath = expander.expand(ProjectExplorerPlugin::defaultBuildDirectoryTemplate());
const QString buildPath = expander.expand(ProjectExplorerPlugin::buildDirectoryTemplate());
return FileUtils::resolvePath(projectDir, buildPath);
}