diff --git a/src/plugins/madde/maemoinstalltosysrootstep.cpp b/src/plugins/madde/maemoinstalltosysrootstep.cpp index d09a0ddf24d..22b4c981b75 100644 --- a/src/plugins/madde/maemoinstalltosysrootstep.cpp +++ b/src/plugins/madde/maemoinstalltosysrootstep.cpp @@ -83,6 +83,8 @@ public: return QLatin1String("") + displayName() + QLatin1String(""); } + virtual bool showWidget() const { return false; } + private: Q_SLOT void handleStepToBeRemoved(int step) { @@ -133,6 +135,7 @@ public: virtual QString displayName() const { return m_buildStep ? m_buildStep.data()->displayName() : QString(); } + virtual bool showWidget() const { return false; } private: const QWeakPointer m_buildStep; }; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp index 20cbe35d9db..476e50e50c6 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp @@ -678,6 +678,11 @@ QString S60DeployStepWidget::displayName() const return tr("Deploy SIS Package"); } +bool S60DeployStepWidget::showWidget() const +{ + return false; +} + // #pragma mark -- S60DeployStepFactory S60DeployStepFactory::S60DeployStepFactory(QObject *parent) : diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h index 24102f5893d..641e9fd26d6 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h @@ -215,6 +215,7 @@ public: QString summaryText() const; QString displayName() const; + bool showWidget() const; }; } // Internal diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp index 5bc4614e92b..33d47e3ce77 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.cpp +++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp @@ -69,6 +69,8 @@ public: QString displayName() const { return QString(); } + bool showWidget() const { return false; } + private: const TarPackageCreationStep * const m_step; }; diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp index 8bc764e9624..22dc896c42f 100644 --- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp +++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp @@ -32,6 +32,7 @@ #include "uploadandinstalltarpackagestep.h" #include "remotelinuxdeployconfiguration.h" +#include "remotelinuxdeploystepwidget.h" #include "remotelinuxpackageinstaller.h" #include "tarpackagecreationstep.h" @@ -41,11 +42,33 @@ using namespace ProjectExplorer; namespace RemoteLinux { namespace Internal { +namespace { + +class ConfigWidget : public BuildStepConfigWidget +{ + Q_OBJECT +public: + ConfigWidget(UploadAndInstallTarPackageStep *step) : m_widget(step) + { + connect(&m_widget, SIGNAL(updateSummary()), SIGNAL(updateSummary())); + } + ~ConfigWidget() {} + +private: + QString summaryText() const { return m_widget.summaryText(); } + QString displayName() const { return m_widget.displayName(); } + bool showWidget() const { return false; } + + RemoteLinuxDeployStepWidget m_widget; +}; +} // anonymous namespace + class UploadAndInstallTarPackageServicePrivate { public: RemoteLinuxTarPackageInstaller installer; }; + } // namespace Internal using namespace Internal; @@ -99,6 +122,11 @@ bool UploadAndInstallTarPackageStep::initInternal(QString *error) return m_deployService->isDeploymentPossible(error); } +BuildStepConfigWidget *UploadAndInstallTarPackageStep::createConfigWidget() +{ + return new ConfigWidget(this); +} + QString UploadAndInstallTarPackageStep::stepId() { return QLatin1String("MaemoUploadAndInstallTarPackageStep"); @@ -110,3 +138,5 @@ QString UploadAndInstallTarPackageStep::displayName() } } //namespace RemoteLinux + +#include "uploadandinstalltarpackagestep.moc" diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h index 3bcde1b2b39..271ae9d3f64 100644 --- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h +++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h @@ -68,6 +68,8 @@ public: bool initInternal(QString *error = 0); + ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); + static QString stepId(); static QString displayName();