From e92c30f15a4c381917fe622825b878f32089518e Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Tue, 30 Mar 2010 17:08:00 +0200
Subject: [PATCH] Fix not updating makestep make label on qt version change
---
src/plugins/qt4projectmanager/makestep.cpp | 11 ++++++++++-
src/plugins/qt4projectmanager/makestep.h | 1 +
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index 300b28df89b..04fa070e504 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -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;
}
diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h
index 54f7af7876e..133cd784ee8 100644
--- a/src/plugins/qt4projectmanager/makestep.h
+++ b/src/plugins/qt4projectmanager/makestep.h
@@ -127,6 +127,7 @@ private slots:
void updateMakeOverrideLabel();
void updateDetails();
void userArgumentsChanged();
+ void qtVersionChanged();
private:
Ui::MakeStep *m_ui;
MakeStep *m_makeStep;
--
GitLab