Skip to content

GitLab

Q
qt-creator
Commit ea239676 authored by Tobias Hunger's avatar Tobias Hunger Committed by Tim Jenssen
Browse files
Options

qmake: Simplify QmakeProFileNode::buildDir 

Change-Id: Ibca12d7c88e2dbdd3d9097a0c199d8ef039a56f4
Reviewed-by: Tim Jenssen's avatarTim Jenssen <tim.jenssen@qt.io>
parent 167762c2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View file @ ea239676
......@@ -2250,8 +2250,8 @@ QString QmakeProFileNode::sourceDir() const
QString QmakeProFileNode::buildDir(QmakeBuildConfiguration *bc) const
{
const QDir srcDirRoot = m_project->rootProjectNode()->sourceDir();
const QString relativeDir = srcDirRoot.relativeFilePath(m_projectDir);
const QDir srcDirRoot(m_project->projectDirectory().toString());
const QString relativeDir = srcDirRoot.relativeFilePath(filePath().parentDir().toString());
if (!bc && m_project->activeTarget())
bc = static_cast<QmakeBuildConfiguration *>(m_project->activeTarget()->activeBuildConfiguration());
if (!bc)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment