qmake: Simplify QmakeProFileNode::buildDir

Change-Id: Ibca12d7c88e2dbdd3d9097a0c199d8ef039a56f4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

qmake: Simplify QmakeProFileNode::buildDir
Change-Id: Ibca12d7c88e2dbdd3d9097a0c199d8ef039a56f4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
ea239676 · Tobias Hunger · Tim Jenssen · 167762c2 · ea239676
Commit ea239676 authored Feb 15, 2017 by Tobias Hunger Committed by Tim Jenssen Feb 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/plugins/qmakeprojectmanager/qmakenodes.cpp src/plugins/qmakeprojectmanager/qmakenodes.cpp +2 -2

No files found.
--- 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<QmakeBuildConfiguration *>(m_project->activeTarget()->activeBuildConfiguration());
    if (!bc)