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

qmake: Simplify QmakeProFileNode::buildDir

Browse Source 
Change-Id: Ibca12d7c88e2dbdd3d9097a0c199d8ef039a56f4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-02-15 12:43:32 +01:00
committed by Tim Jenssen
parent 167762c2c6
commit ea23967630
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -2250,8 +2250,8 @@ QString QmakeProFileNode::sourceDir() const
QString QmakeProFileNode::buildDir(QmakeBuildConfiguration *bc) const QString QmakeProFileNode::buildDir(QmakeBuildConfiguration *bc) const
{ {
const QDir srcDirRoot = m_project->rootProjectNode()->sourceDir(); const QDir srcDirRoot(m_project->projectDirectory().toString());
const QString relativeDir = srcDirRoot.relativeFilePath(m_projectDir); const QString relativeDir = srcDirRoot.relativeFilePath(filePath().parentDir().toString());
if (!bc && m_project->activeTarget()) if (!bc && m_project->activeTarget())
bc = static_cast<QmakeBuildConfiguration *>(m_project->activeTarget()->activeBuildConfiguration()); bc = static_cast<QmakeBuildConfiguration *>(m_project->activeTarget()->activeBuildConfiguration());
if (!bc) if (!bc)