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

On qt version change updat qmakestep config widget

Browse Source 
That is the effective qmake command and summary label.
This commit is contained in:
dt
2009-10-29 19:42:56 +01:00
parent 074b719b79
commit 4798ec5529
4 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

1
src/plugins/qt4projectmanager/qmakestep.h
View File

@@ -107,6 +107,7 @@ private slots:
void qmakeArgumentsLineEditTextEdited(); void qmakeArgumentsLineEditTextEdited();
void buildConfigurationChanged(); void buildConfigurationChanged();
void update(); void update();
void qtVersionChanged(ProjectExplorer::BuildConfiguration *bc);
private: private:
void updateTitleLabel(); void updateTitleLabel();
void updateEffectiveQMakeCall(); void updateEffectiveQMakeCall();

1
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -984,6 +984,7 @@ int Qt4Project::qtVersionId(BuildConfiguration *configuration) const
void Qt4Project::setQtVersion(BuildConfiguration *configuration, int id) void Qt4Project::setQtVersion(BuildConfiguration *configuration, int id)
{ {
configuration->setValue(KEY_QT_VERSION_ID, id); configuration->setValue(KEY_QT_VERSION_ID, id);
emit qtVersionChanged(configuration);
updateActiveRunConfiguration(); updateActiveRunConfiguration();
} }

1
src/plugins/qt4projectmanager/qt4project.h
View File

@@ -238,6 +238,7 @@ public:
static QString extractSpecFromArgumentList(const QStringList &list); static QString extractSpecFromArgumentList(const QStringList &list);
signals: signals:
void targetInformationChanged(); void targetInformationChanged();
void qtVersionChanged(ProjectExplorer::BuildConfiguration *);
public slots: public slots:
void update(); void update();