Commit e92c30f1 authored by dt's avatar dt
Browse files

Fix not updating makestep make label on qt version change

parent 2b8c7d68
......@@ -222,6 +222,9 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
connect(makeStep->buildConfiguration(), SIGNAL(buildDirectoryChanged()),
this, SLOT(updateDetails()));
connect(makeStep->qt4BuildConfiguration(), SIGNAL(qtVersionChanged()),
this, SLOT(qtVersionChanged()));
connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
this, SLOT(updateMakeOverrideLabel()));
connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
......@@ -233,6 +236,12 @@ MakeStepConfigWidget::~MakeStepConfigWidget()
delete m_ui;
}
void MakeStepConfigWidget::qtVersionChanged()
{
updateMakeOverrideLabel();
updateDetails();
}
void MakeStepConfigWidget::updateMakeOverrideLabel()
{
Qt4BuildConfiguration *qt4bc = m_makeStep->qt4BuildConfiguration();
......@@ -252,7 +261,7 @@ void MakeStepConfigWidget::updateDetails()
// Try to detect command in environment
const QString tmp = environment.searchInPath(makeCmd);
if (tmp.isEmpty()) {
m_summaryText = tr("<b>Make Step:</b> %1 not found in the environment.").arg(makeCmd);
m_summaryText = tr("<b>Make:</b> %1 not found in the environment.").arg(makeCmd);
emit updateSummary();
return;
}
......
......@@ -127,6 +127,7 @@ private slots:
void updateMakeOverrideLabel();
void updateDetails();
void userArgumentsChanged();
void qtVersionChanged();
private:
Ui::MakeStep *m_ui;
MakeStep *m_makeStep;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment