Commit 532c9d49 authored by hjk's avatar hjk Committed by Tobias Hunger
Browse files

QmakeBuildConfiguration: Pass build dir to base setter



Change-Id: I55bd47d62ef644257b49d3423c4d43a6443564aa
Reviewed-by: Tobias Hunger's avatarTobias Hunger <tobias.hunger@qt.io>
parent f1fc8824
......@@ -122,6 +122,8 @@ Utils::FileName BuildConfiguration::rawBuildDirectory() const
void BuildConfiguration::setBuildDirectory(const Utils::FileName &dir)
{
if (dir == m_buildDirectory)
return;
m_buildDirectory = dir;
emitBuildDirectoryChanged();
}
......
......@@ -102,6 +102,8 @@ enum { debug = 0 };
QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target)
: QmakeBuildConfiguration(target, Core::Id(QMAKE_BC_ID))
{
connect(this, &BuildConfiguration::buildDirectoryChanged,
this, &QmakeBuildConfiguration::emitProFileEvaluateNeeded);
}
QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id) :
......@@ -223,14 +225,6 @@ bool QmakeBuildConfiguration::isShadowBuild() const
return buildDirectory() != target()->project()->projectDirectory();
}
void QmakeBuildConfiguration::setBuildDirectory(const FileName &directory)
{
if (directory == buildDirectory())
return;
BuildConfiguration::setBuildDirectory(directory);
emitProFileEvaluateNeeded();
}
QString QmakeBuildConfiguration::makefile() const
{
return static_cast<QmakeProject *>(target()->project())->rootProjectNode()->makefile();
......
......@@ -116,7 +116,6 @@ protected:
QmakeBuildConfiguration(ProjectExplorer::Target *target, QmakeBuildConfiguration *source);
QmakeBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
bool fromMap(const QVariantMap &map) override;
void setBuildDirectory(const Utils::FileName &directory) override;
private:
void ctor();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment