diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoinstalltosysrootstep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoinstalltosysrootstep.cpp index 53cb063d821..4a42ad68454 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemoinstalltosysrootstep.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemoinstalltosysrootstep.cpp @@ -43,6 +43,7 @@ #include #include +#include using namespace ProjectExplorer; @@ -113,10 +114,23 @@ class MaemoCopyFilesToSysrootWidget : public BuildStepConfigWidget { Q_OBJECT public: - virtual void init() { } + MaemoCopyFilesToSysrootWidget(const BuildStep *buildStep) + : m_buildStep(buildStep) {} + + virtual void init() + { + if (m_buildStep) { + connect(m_buildStep.data(), SIGNAL(displayNameChanged()), + SIGNAL(updateSummary())); + } + } virtual QString summaryText() const { return QLatin1String("") + displayName() + QLatin1String(""); } - virtual QString displayName() const { return MaemoCopyToSysrootStep::DisplayName; } + virtual QString displayName() const { + return m_buildStep ? m_buildStep.data()->displayName() : QString(); + } +private: + const QWeakPointer m_buildStep; }; @@ -322,7 +336,7 @@ void MaemoCopyToSysrootStep::run(QFutureInterface &fi) BuildStepConfigWidget *MaemoCopyToSysrootStep::createConfigWidget() { - return new MaemoCopyFilesToSysrootWidget; + return new MaemoCopyFilesToSysrootWidget(this); } const QString MaemoCopyToSysrootStep::Id @@ -334,12 +348,14 @@ const QString MaemoCopyToSysrootStep::DisplayName MaemoMakeInstallToSysrootStep::MaemoMakeInstallToSysrootStep(BuildStepList *bsl) : AbstractProcessStep(bsl, Id) { + setDefaultDisplayName(DisplayName); } MaemoMakeInstallToSysrootStep::MaemoMakeInstallToSysrootStep(BuildStepList *bsl, MaemoMakeInstallToSysrootStep *other) : AbstractProcessStep(bsl, other) { + setDefaultDisplayName(DisplayName); } bool MaemoMakeInstallToSysrootStep::init() @@ -371,7 +387,7 @@ bool MaemoMakeInstallToSysrootStep::init() BuildStepConfigWidget *MaemoMakeInstallToSysrootStep::createConfigWidget() { - return new MaemoCopyFilesToSysrootWidget; + return new MaemoCopyFilesToSysrootWidget(this); } const QString MaemoMakeInstallToSysrootStep::Id