forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/4.5' into master
Change-Id: Ibcdd1230b40d1ca7a414843ee0f9ae4cddb29f6f
This commit is contained in:
@@ -142,6 +142,7 @@ QbsRunConfiguration::QbsRunConfiguration(Target *target)
|
||||
|
||||
void QbsRunConfiguration::initialize(Core::Id id)
|
||||
{
|
||||
RunConfiguration::initialize(id);
|
||||
m_uniqueProductName = uniqueProductNameFromId(id);
|
||||
ctor();
|
||||
}
|
||||
@@ -337,6 +338,7 @@ QbsRunConfigurationWidget::QbsRunConfigurationWidget(QbsRunConfiguration *rc)
|
||||
|
||||
connect(m_rc, &RunConfiguration::enabledChanged,
|
||||
this, &QbsRunConfigurationWidget::targetInformationHasChanged);
|
||||
targetInformationHasChanged();
|
||||
|
||||
Core::VariableChooser::addSupportForChildWidgets(this, rc->macroExpander());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user