Merge remote-tracking branch 'origin/master' into 4.5

Change-Id: Ic3a34b18708d637c94000e9bb3cad1b500e7356d
This commit is contained in:
Eike Ziller
2017-09-27 06:34:25 +02:00
3 changed files with 70 additions and 45 deletions

View File

@@ -30,6 +30,7 @@
#include "qbsproject.h"
#include <coreplugin/messagemanager.h>
#include <coreplugin/variablechooser.h>
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/buildstep.h>
#include <projectexplorer/buildsteplist.h>
@@ -336,6 +337,8 @@ QbsRunConfigurationWidget::QbsRunConfigurationWidget(QbsRunConfiguration *rc)
connect(m_rc, &RunConfiguration::enabledChanged,
this, &QbsRunConfigurationWidget::targetInformationHasChanged);
Core::VariableChooser::addSupportForChildWidgets(this, rc->macroExpander());
}
void QbsRunConfigurationWidget::targetInformationHasChanged()