diff options
author | hjk <hjk@qt.io> | 2016-12-05 09:37:40 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2016-12-05 09:20:55 +0000 |
commit | 532c9d49ac7e9d99f5fe5feba3c091a0e2d93d28 (patch) | |
tree | ea89bdcfa510c3ff24d35f76f3a34e4bb471a782 /src/plugins | |
parent | f1fc8824c0b56d2b9b437886137e3bb31c53bd5a (diff) | |
download | qt-creator-532c9d49ac7e9d99f5fe5feba3c091a0e2d93d28.tar.gz |
QmakeBuildConfiguration: Pass build dir to base setter
Change-Id: I55bd47d62ef644257b49d3423c4d43a6443564aa
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins')
3 files changed, 4 insertions, 9 deletions
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index 3625990b31..ec3cf9894f 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -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(); } diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index 86928ce9c9..86e8764561 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -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(); diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h index 120a375806..9f69b2681f 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h @@ -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(); |