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

Merge commit 'origin/1.3'

Browse Source
This commit is contained in:
con
2009-10-30 17:22:01 +01:00
parent 8708e04b04 50961cb98d
commit 3e81572b8a
16 changed files with 269 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qt4projectmanager/qmakestep.cpp
View File

@@ -214,6 +214,8 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
connect(m_ui.buildConfigurationComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(buildConfigurationChanged()));
connect(step, SIGNAL(changed()),
this, SLOT(update()));
connect(step->project(), SIGNAL(qtVersionChanged(ProjectExplorer::BuildConfiguration *)),
this, SLOT(qtVersionChanged(ProjectExplorer::BuildConfiguration *)));
}
QString QMakeStepConfigWidget::summaryText() const
@@ -221,6 +223,14 @@ QString QMakeStepConfigWidget::summaryText() const
return m_summaryText;
}
void QMakeStepConfigWidget::qtVersionChanged(ProjectExplorer::BuildConfiguration *bc)
{
if (bc && bc->name() == m_buildConfiguration) {
updateTitleLabel();
updateEffectiveQMakeCall();
}
}
void QMakeStepConfigWidget::updateTitleLabel()
{
Qt4Project *qt4project = qobject_cast<Qt4Project *>(m_step->project());