From ea23967630866010f73ce6a36933ded83f956154 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 15 Feb 2017 12:43:32 +0100 Subject: [PATCH] qmake: Simplify QmakeProFileNode::buildDir Change-Id: Ibca12d7c88e2dbdd3d9097a0c199d8ef039a56f4 Reviewed-by: Tim Jenssen --- src/plugins/qmakeprojectmanager/qmakenodes.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 958c026e82c..a61b9b7d1d3 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -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(m_project->activeTarget()->activeBuildConfiguration()); if (!bc)