feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix not updating makestep make label on qt version change

Browse Source
This commit is contained in:
dt
2010-03-30 17:08:00 +02:00
parent 2b8c7d6826
commit e92c30f15a
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qt4projectmanager/makestep.cpp
View File

@@ -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;
}