forked from qt-creator/qt-creator
Cmake: Let the generator determine the toolchain
Otherwise we need to parse the cbp file, which happens only if the buildconfiguration gets active. Also try to decouple a few internals a little bit by using signals. The CMakeProject still handles a few things directly instead of via signals, more to come eventually.
This commit is contained in:
@@ -52,13 +52,12 @@ CMakeBuildEnvironmentWidget::CMakeBuildEnvironmentWidget(CMakeProject *project)
|
||||
m_buildEnvironmentWidget = new ProjectExplorer::EnvironmentWidget(this, m_clearSystemEnvironmentCheckBox);
|
||||
vbox->addWidget(m_buildEnvironmentWidget);
|
||||
|
||||
connect(m_buildEnvironmentWidget, SIGNAL(userChangesUpdated()),
|
||||
this, SLOT(environmentModelUserChangesUpdated()));
|
||||
connect(m_buildEnvironmentWidget, SIGNAL(userChangesChanged()),
|
||||
this, SLOT(environmentModelUserChangesChanged()));
|
||||
connect(m_clearSystemEnvironmentCheckBox, SIGNAL(toggled(bool)),
|
||||
this, SLOT(clearSystemEnvironmentCheckBoxClicked(bool)));
|
||||
}
|
||||
|
||||
|
||||
QString CMakeBuildEnvironmentWidget::displayName() const
|
||||
{
|
||||
return tr("Build Environment");
|
||||
@@ -77,7 +76,7 @@ void CMakeBuildEnvironmentWidget::init(ProjectExplorer::BuildConfiguration *bc)
|
||||
m_buildEnvironmentWidget->updateButtons();
|
||||
}
|
||||
|
||||
void CMakeBuildEnvironmentWidget::environmentModelUserChangesUpdated()
|
||||
void CMakeBuildEnvironmentWidget::environmentModelUserChangesChanged()
|
||||
{
|
||||
m_buildConfiguration->setUserEnvironmentChanges(m_buildEnvironmentWidget->userChanges());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user