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

BuildConfiguration: Use ProjectMacroExpander

Browse Source 
So that in the context of the buildconfiguration and its buildsteps
current project and others refers to the project of the bc.

Task-number: QTCREATORBUG-12869
Change-Id: Idad7741301432a5fddffdff4225762f4100a3dee
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Daniel Teske
2014-10-06 13:15:40 +02:00
parent be65afa958
commit 7255b71422
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/projectexplorer/buildconfiguration.cpp
View File

@@ -35,10 +35,12 @@
#include "target.h" #include "target.h"
#include "project.h" #include "project.h"
#include "kit.h" #include "kit.h"
#include "projectmacroexpander.h"
#include <coreplugin/variablemanager.h> #include <coreplugin/variablemanager.h>
#include <projectexplorer/buildenvironmentwidget.h> #include <projectexplorer/buildenvironmentwidget.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <coreplugin/idocument.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h> #include <utils/stringutils.h>
@@ -55,10 +57,16 @@ static const char BUILDDIRECTORY_KEY[] = "ProjectExplorer.BuildConfiguration.Bui
namespace ProjectExplorer { namespace ProjectExplorer {
namespace Internal { namespace Internal {
class BuildConfigMacroExpander : public Utils::AbstractMacroExpander class BuildConfigMacroExpander : public ProjectMacroExpander
{ {
public: public:
explicit BuildConfigMacroExpander(const BuildConfiguration *bc) : m_bc(bc) {} explicit BuildConfigMacroExpander(const BuildConfiguration *bc)
: ProjectMacroExpander(bc->target()->project()->document()->filePath(),
bc->target()->project()->displayName(),
bc->target()->kit(),
bc->displayName()),
m_bc(bc)
{}
virtual bool resolveMacro(const QString &name, QString *ret); virtual bool resolveMacro(const QString &name, QString *ret);
private: private:
const BuildConfiguration *m_bc; const BuildConfiguration *m_bc;
@@ -66,6 +74,7 @@ private:
bool BuildConfigMacroExpander::resolveMacro(const QString &name, QString *ret) bool BuildConfigMacroExpander::resolveMacro(const QString &name, QString *ret)
{ {
// legacy variables
if (name == QLatin1String("sourceDir")) { if (name == QLatin1String("sourceDir")) {
*ret = m_bc->target()->project()->projectDirectory().toUserOutput(); *ret = m_bc->target()->project()->projectDirectory().toUserOutput();
return true; return true;
@@ -74,9 +83,8 @@ bool BuildConfigMacroExpander::resolveMacro(const QString &name, QString *ret)
*ret = m_bc->buildDirectory().toUserOutput(); *ret = m_bc->buildDirectory().toUserOutput();
return true; return true;
} }
bool found;
*ret = Core::VariableManager::value(name.toUtf8(), &found); return ProjectMacroExpander::resolveMacro(name, ret);
return found;
} }
} // namespace Internal } // namespace Internal