summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-02-28 11:31:09 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2017-05-02 10:08:44 +0000
commitdacf13948ea65f0a944b8e07fae8d9cd1a6a1273 (patch)
treebe5e88020eddec3232869a2a0576aeb4335179c0
parent1b30990f24e6cf2150b268ece841857eed7222a0 (diff)
downloadqt-creator-dacf13948ea65f0a944b8e07fae8d9cd1a6a1273.tar.gz
QbsProjectManager: Fix updating of run environment
When the build environment was changed, the run environment widget would not update. Change-Id: I8a318d86b5ac56ca9233cf4c694ca3c9f88870ed Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
index 4b85e79f93..6730963ab2 100644
--- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
@@ -112,9 +112,14 @@ QbsRunConfiguration::QbsRunConfiguration(Target *parent, Core::Id id) :
m_uniqueProductName(uniqueProductNameFromId(id)),
m_currentBuildStepList(0)
{
- addExtraAspect(new LocalEnvironmentAspect(this, [](RunConfiguration *rc, Environment &env) {
- static_cast<QbsRunConfiguration *>(rc)->addToBaseEnvironment(env);
- }));
+ auto * const envAspect = new LocalEnvironmentAspect(this,
+ [](RunConfiguration *rc, Environment &env) {
+ static_cast<QbsRunConfiguration *>(rc)->addToBaseEnvironment(env);
+ }
+ );
+ addExtraAspect(envAspect);
+ connect(static_cast<QbsProject *>(parent->project()), &QbsProject::parsingFinished, this,
+ [envAspect]() { envAspect->buildEnvironmentHasChanged(); });
addExtraAspect(new ArgumentsAspect(this, QStringLiteral("Qbs.RunConfiguration.CommandLineArguments")));
addExtraAspect(new WorkingDirectoryAspect(this, QStringLiteral("Qbs.RunConfiguration.WorkingDirectory")));