From 06483d3720e385adb16d6b84592e890239ef2020 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@theqtcompany.com>
Date: Mon, 3 Aug 2015 12:55:18 +0200
Subject: [PATCH] Fix "Make" build step not being updated on environment
changes
Change-Id: If356830b064229d74f0b69360301c4091bcb2acf
Task-number: QTCREATORBUG-14831
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
---
src/plugins/qmakeprojectmanager/makestep.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/plugins/qmakeprojectmanager/makestep.cpp b/src/plugins/qmakeprojectmanager/makestep.cpp
index b6991cf1bf3..60c0b8240cf 100644
--- a/src/plugins/qmakeprojectmanager/makestep.cpp
+++ b/src/plugins/qmakeprojectmanager/makestep.cpp
@@ -347,6 +347,8 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
if (bc) {
connect(bc, SIGNAL(buildDirectoryChanged()),
this, SLOT(updateDetails()));
+ connect(bc, &BuildConfiguration::environmentChanged,
+ this, &MakeStepConfigWidget::updateDetails);
}
connect(ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
@@ -359,6 +361,8 @@ void MakeStepConfigWidget::activeBuildConfigurationChanged()
if (m_bc) {
disconnect(m_bc, SIGNAL(buildDirectoryChanged()),
this, SLOT(updateDetails()));
+ disconnect(m_bc, &BuildConfiguration::environmentChanged,
+ this, &MakeStepConfigWidget::updateDetails);
}
m_bc = m_makeStep->target()->activeBuildConfiguration();
@@ -367,6 +371,8 @@ void MakeStepConfigWidget::activeBuildConfigurationChanged()
if (m_bc) {
connect(m_bc, SIGNAL(buildDirectoryChanged()),
this, SLOT(updateDetails()));
+ connect(m_bc, &BuildConfiguration::environmentChanged,
+ this, &MakeStepConfigWidget::updateDetails);
}
}
--
GitLab