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

Fix build

Browse Source 
after a43331ba67

Change-Id: I085e6b6312f4282a0f3ee2c7d3cf806d78d37422
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Eike Ziller
2018-10-10 12:52:41 +02:00
committed by Tobias Hunger
parent a43331ba67
commit 4a3546f58a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
View File

@@ -41,6 +41,7 @@
#include <projectexplorer/deployconfiguration.h> #include <projectexplorer/deployconfiguration.h>
#include <projectexplorer/kit.h> #include <projectexplorer/kit.h>
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectmacroexpander.h> #include <projectexplorer/projectmacroexpander.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
@@ -66,7 +67,7 @@ static FileName defaultBuildDirectory(const QString &projectFilePath, const Kit
const QString projectName = QFileInfo(projectFilePath).completeBaseName(); const QString projectName = QFileInfo(projectFilePath).completeBaseName();
ProjectMacroExpander expander(projectFilePath, projectName, k, bcName, buildType); ProjectMacroExpander expander(projectFilePath, projectName, k, bcName, buildType);
QString projectDir = Project::projectDirectory(FileName::fromString(projectFilePath)).toString(); 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)); return FileName::fromString(FileUtils::resolvePath(projectDir, buildPath));
} }

3
src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
View File

@@ -34,6 +34,7 @@
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/kitmanager.h> #include <projectexplorer/kitmanager.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectmacroexpander.h> #include <projectexplorer/projectmacroexpander.h>
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
@@ -93,7 +94,7 @@ static QString buildDir(const QString &projectFilePath, const Kit *k)
BuildConfiguration::Unknown); BuildConfiguration::Unknown);
const QString projectDir const QString projectDir
= Project::projectDirectory(FileName::fromString(projectFilePath)).toString(); = 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); return FileUtils::resolvePath(projectDir, buildPath);
} }