Skip to content
Snippets Groups Projects
Commit e92c30f1 authored by dt's avatar dt
Browse files

Fix not updating makestep make label on qt version change

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