diff --git a/src/plugins/remotelinux/abstractpackagingstep.cpp b/src/plugins/remotelinux/abstractpackagingstep.cpp index c328837628c..dc235804145 100644 --- a/src/plugins/remotelinux/abstractpackagingstep.cpp +++ b/src/plugins/remotelinux/abstractpackagingstep.cpp @@ -42,7 +42,6 @@ namespace Internal { class AbstractPackagingStepPrivate { public: - BuildConfiguration *currentBuildConfiguration = nullptr; QString cachedPackageFilePath; QString cachedPackageDirectory; bool deploymentDataModified = false; @@ -54,9 +53,6 @@ AbstractPackagingStep::AbstractPackagingStep(BuildStepList *bsl, Core::Id id) : BuildStep(bsl, id) { d = new Internal::AbstractPackagingStepPrivate; - connect(target(), &Target::activeBuildConfigurationChanged, - this, &AbstractPackagingStep::handleBuildConfigurationChanged); - handleBuildConfigurationChanged(); connect(target(), &Target::deploymentDataChanged, this, &AbstractPackagingStep::setDeploymentDataModified); @@ -71,18 +67,6 @@ AbstractPackagingStep::~AbstractPackagingStep() delete d; } -void AbstractPackagingStep::handleBuildConfigurationChanged() -{ - if (d->currentBuildConfiguration) - disconnect(d->currentBuildConfiguration, nullptr, this, nullptr); - d->currentBuildConfiguration = buildConfiguration(); - if (d->currentBuildConfiguration) { - connect(d->currentBuildConfiguration, &BuildConfiguration::buildDirectoryChanged, - this, &AbstractPackagingStep::packageFilePathChanged); - } - emit packageFilePathChanged(); -} - QString AbstractPackagingStep::cachedPackageFilePath() const { return d->cachedPackageFilePath; @@ -102,8 +86,7 @@ QString AbstractPackagingStep::cachedPackageDirectory() const QString AbstractPackagingStep::packageDirectory() const { - return d->currentBuildConfiguration - ? d->currentBuildConfiguration->buildDirectory().toString() : QString(); + return buildConfiguration()->buildDirectory().toString(); } bool AbstractPackagingStep::isPackagingNeeded() const diff --git a/src/plugins/remotelinux/abstractpackagingstep.h b/src/plugins/remotelinux/abstractpackagingstep.h index d792e2e8709..616c76d921e 100644 --- a/src/plugins/remotelinux/abstractpackagingstep.h +++ b/src/plugins/remotelinux/abstractpackagingstep.h @@ -46,7 +46,6 @@ public: bool init() override; signals: - void packageFilePathChanged(); void unmodifyDeploymentData(); protected: @@ -61,7 +60,6 @@ protected: virtual bool isPackagingNeeded() const; private: - void handleBuildConfigurationChanged(); void setDeploymentDataUnmodified(); void setDeploymentDataModified(); diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp index 26ac446028c..b46f5ba79d4 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.cpp +++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp @@ -82,6 +82,14 @@ TarPackageCreationStep::TarPackageCreationStep(BuildStepList *bsl) m_incrementalDeploymentAspect = addAspect(); m_incrementalDeploymentAspect->setLabel(tr("Package modified files only")); m_incrementalDeploymentAspect->setSettingsKey(IncrementalDeploymentKey); + + setSummaryUpdater([this] { + QString path = packageFilePath(); + if (path.isEmpty()) + return QString("" + tr("Tarball creation not possible.") + + ""); + return QString("" + tr("Create tarball:") + " " + path); + }); } bool TarPackageCreationStep::init() @@ -344,29 +352,6 @@ bool TarPackageCreationStep::runImpl() return success; } -BuildStepConfigWidget *TarPackageCreationStep::createConfigWidget() -{ - auto widget = BuildStep::createConfigWidget(); - - auto updateSummary = [this, widget] { - QString path = packageFilePath(); - if (path.isEmpty()) { - widget->setSummaryText("" - + tr("Tarball creation not possible.") - + ""); - } else { - widget->setSummaryText("" + tr("Create tarball:") + " " + path); - } - }; - - connect(this, &AbstractPackagingStep::packageFilePathChanged, - this, updateSummary); - - updateSummary(); - - return widget; -} - bool TarPackageCreationStep::fromMap(const QVariantMap &map) { if (!AbstractPackagingStep::fromMap(map)) diff --git a/src/plugins/remotelinux/tarpackagecreationstep.h b/src/plugins/remotelinux/tarpackagecreationstep.h index 1d359032bdf..fca28eae67e 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.h +++ b/src/plugins/remotelinux/tarpackagecreationstep.h @@ -63,7 +63,6 @@ private: void addNeededDeploymentFiles(const ProjectExplorer::DeployableFile &deployable, const ProjectExplorer::Kit *kit); - ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; bool fromMap(const QVariantMap &map) override; QVariantMap toMap() const override;