From 4a3546f58a766d9706efc4209f554f3b4b324b89 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Wed, 10 Oct 2018 12:52:41 +0200
Subject: [PATCH] Fix build

after a43331ba67f4fa33b60338ac04a2dc4a455bb253

Change-Id: I085e6b6312f4282a0f3ee2c7d3cf806d78d37422
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp | 3 ++-
 src/plugins/qbsprojectmanager/qbsprojectimporter.cpp    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
index 20cade26bbe..1fcaec1f449 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
@@ -41,6 +41,7 @@
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitinformation.h>
+#include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectmacroexpander.h>
 #include <projectexplorer/target.h>
@@ -66,7 +67,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::defaultBuildDirectory());
+    QString buildPath = expander.expand(ProjectExplorerPlugin::defaultBuildDirectoryTemplate());
     return FileName::fromString(FileUtils::resolvePath(projectDir, buildPath));
 }
 
diff --git a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
index 11aaff4c1d5..1cbee464d22 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
@@ -34,6 +34,7 @@
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectmacroexpander.h>
 #include <projectexplorer/toolchain.h>
@@ -93,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::defaultBuildDirectory());
+    const QString buildPath = expander.expand(ProjectExplorerPlugin::defaultBuildDirectoryTemplate());
     return FileUtils::resolvePath(projectDir, buildPath);
 }