forked from qt-creator/qt-creator
On qt version change updat qmakestep config widget
That is the effective qmake command and summary label.
This commit is contained in:
@@ -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());
|
||||
|
||||
@@ -107,6 +107,7 @@ private slots:
|
||||
void qmakeArgumentsLineEditTextEdited();
|
||||
void buildConfigurationChanged();
|
||||
void update();
|
||||
void qtVersionChanged(ProjectExplorer::BuildConfiguration *bc);
|
||||
private:
|
||||
void updateTitleLabel();
|
||||
void updateEffectiveQMakeCall();
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -238,6 +238,7 @@ public:
|
||||
static QString extractSpecFromArgumentList(const QStringList &list);
|
||||
signals:
|
||||
void targetInformationChanged();
|
||||
void qtVersionChanged(ProjectExplorer::BuildConfiguration *);
|
||||
|
||||
public slots:
|
||||
void update();
|
||||
|
||||
Reference in New Issue
Block a user