diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index fc6296576ab00e3d25b14cdea7acfc8acbc3b174..92dc312a3a18e25e958e03fc10e91a4c4b56865d 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -209,6 +209,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 @@ -216,6 +218,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()); diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h index 6588fa41bf6a387663e1a145a94513a8423b8829..d23d471636e28ab4bc0f9bf204824f8eeedd9e86 100644 --- a/src/plugins/qt4projectmanager/qmakestep.h +++ b/src/plugins/qt4projectmanager/qmakestep.h @@ -107,6 +107,7 @@ private slots: void qmakeArgumentsLineEditTextEdited(); void buildConfigurationChanged(); void update(); + void qtVersionChanged(ProjectExplorer::BuildConfiguration *bc); private: void updateTitleLabel(); void updateEffectiveQMakeCall(); diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index 3f6e89b963b1fcd331ca479ac4ebce0d918271a3..b188b7855af6cca05ccb9d204c8ea4115e1a9b00 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -984,6 +984,7 @@ int Qt4Project::qtVersionId(BuildConfiguration *configuration) const void Qt4Project::setQtVersion(BuildConfiguration *configuration, int id) { configuration->setValue(KEY_QT_VERSION_ID, id); + emit qtVersionChanged(configuration); updateActiveRunConfiguration(); } diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h index a9ed61871dd53b99e27e84f3a7cffdabc47d96a3..95f2c79b4d0e557273c05203c8edd2ca828168e2 100644 --- a/src/plugins/qt4projectmanager/qt4project.h +++ b/src/plugins/qt4projectmanager/qt4project.h @@ -238,6 +238,7 @@ public: static QString extractSpecFromArgumentList(const QStringList &list); signals: void targetInformationChanged(); + void qtVersionChanged(ProjectExplorer::BuildConfiguration *); public slots: void update();